修改bug

src/main/java/org/rcisoft/business/sysunit/service/impl/SysUnitServiceImpl.java

@@ -262,13 +262,16 @@ public class SysUnitServiceImpl extends ServiceImpl<SysUnitRepository, SysUnit>
         }
         //超级管理员
         if (cyInitComp.admin[0].equals(CyUserUtil.getAuthenRoleIds())) {
-            return baseMapper.findAllUnit();
+            List<SysUnit> allUnit = baseMapper.findAllUnit();
+            SysUnit sysUnit = new SysUnit();
+            sysUnit.setUnitName("全部");
+            allUnit.add(sysUnit);
+            return allUnit;
         }
         //商家
         if (cyInitComp.unit[0].equals(CyUserUtil.getAuthenRoleIds())) {
             return baseMapper.findUnit(userId);
         }
-
         //根据用户id查询当前人的商家信息 （代言人）
         return baseMapper.findUnitByUnit(userId);
     }

src/main/java/org/rcisoft/business/sysuser/service/impl/SysUserServiceImpl.java

@@ -90,9 +90,9 @@ public class SysUserServiceImpl extends ServiceImpl<AdminSysUserRepository, SysU
                 throw new CyServiceException(AdminUserInfoExceptionEnums.USERNAME_EXISTS);
             }
 
-            if (StringUtils.isNotEmpty(sysUser.getPhone())) {
-                throw new CyServiceException(AdminUserInfoExceptionEnums.PHONE_EXISTS);
-            }
+//            if (StringUtils.isNotEmpty(sysUser.getPhone())) {
+//                throw new CyServiceException(AdminUserInfoExceptionEnums.PHONE_EXISTS);
+//            }
 
             if (StringUtils.isNotEmpty(sysUser.getIdNumber())) {
                 throw new CyServiceException(AdminUserInfoExceptionEnums.ID_NUMBER_EXISTS);

src/main/resources/mapper/business/cmspriceclick/mapper/CmsPriceClickMapper.xml

@@ -328,8 +328,8 @@
             resultType="org.rcisoft.business.cmspriceclick.entity.WxUserImageDTO">
         SELECT su.`name` as name,
         su.username as username,
-#                su.business_id as ,
-#                su.unit_id,
+        # su.business_id as ,
+        # su.unit_id,
         cpcn.clickThroughRate as clickThroughRate,
         cpcn.clickThroughRateArticle as clickThroughRateArticle,
         cpcv.clickThroughRateVideo as clickThroughRateVideo,
@@ -341,7 +341,10 @@
         suu.unit_id
         FROM sys_user su
         LEFT JOIN sys_user_unit suu ON suu.user_id = su.business_id
-              WHERE suu.unit_id = #{wxUserImageDTO.unitId}
+        WHERE 1=1
+        <if test="wxUserImageDTO.unitId != null  ">
+            AND suu.unit_id = #{wxUserImageDTO.unitId}
+        </if>
         AND su.identity = 3
         GROUP BY su.username,
         su.business_id) su
@@ -358,7 +361,10 @@
         suu.unit_id
         FROM sys_user su
         LEFT JOIN sys_user_unit suu ON suu.user_id = su.business_id
-                                  WHERE suu.unit_id = #{wxUserImageDTO.unitId}
+        WHERE 1=1
+        <if test="wxUserImageDTO.unitId != null  ">
+            AND suu.unit_id = #{wxUserImageDTO.unitId}
+        </if>
         AND su.identity = 3
         GROUP BY su.username,
         su.business_id) su
@@ -381,7 +387,10 @@
         suu.unit_id
         FROM sys_user su
         LEFT JOIN sys_user_unit suu ON suu.user_id = su.business_id
-                                  WHERE suu.unit_id = #{wxUserImageDTO.unitId}
+        WHERE 1=1
+        <if test="wxUserImageDTO.unitId != null  ">
+            AND suu.unit_id = #{wxUserImageDTO.unitId}
+        </if>
         AND su.identity = 3
         GROUP BY su.username,
         su.business_id) su