Merge branch 'master' of http://1.14.104.71:10880/root/ylrz_scrm_java

fs-company-app/src/main/java/com/fs/app/controller/CompanyUserController.java

@@ -190,6 +190,7 @@ public class CompanyUserController extends AppBaseController {
         BeanUtils.copyProperties(param, companyUser);
 
         companyUser.setUserName(param.getPhoneNumber());
+        companyUser.setUserType("01");
         companyUser.setPhonenumber(param.getPhoneNumber());
         companyUser.setPassword(SecurityUtils.encryptPassword(companyUser.getPassword()));
         companyUser.setCreateTime(new Date());

fs-service-system/src/main/resources/mapper/store/FsUserMapper.xml

@@ -747,7 +747,8 @@
                 LEFT JOIN company_user ON company_user.user_id = fs_user.company_user_id
         WHERE
         (company_user.user_id = #{userId} or company_user.parent_id = #{userId} )
-            <if test="dateTag != null and dateTag !='' ">
+        and fs_course_red_packet_log.status = 1
+        <if test="dateTag != null and dateTag !='' ">
                 <choose>
                     <when test = "dateTag == '今天'">
                         and to_days(fs_course_red_packet_log.create_time) = to_days(now())