小程序选择商家去重

src/main/java/org/rcisoft/business/sysunit/dao/SysUnitRepository.java

@@ -92,5 +92,7 @@ public interface SysUnitRepository extends CyBaseMapper<SysUnit> {
     ArrayList<Integer> findUserId(Integer unitId);
 
     List<SysUnit> findUnit(String userId);
+
+    List<SysUnit> findAllUnit();
 }
 

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

@@ -260,6 +260,10 @@ public class SysUnitServiceImpl extends ServiceImpl<SysUnitRepository, SysUnit>
             throw new CyServiceException(ResultServiceEnums.NOT_LOGIN.getCode(),
                     ResultServiceEnums.NOT_LOGIN.getMessage());
         }
+        //超级管理员
+        if (cyInitComp.admin[0].equals(CyUserUtil.getAuthenRoleIds())) {
+            return baseMapper.findAllUnit();
+        }
         //商家
         if (cyInitComp.unit[0].equals(CyUserUtil.getAuthenRoleIds())) {
             return baseMapper.findUnit(userId);

src/main/java/org/rcisoft/business/sysuser/controller/SysUserController.java

@@ -13,7 +13,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.ss.usermodel.WorkbookFactory;
 import org.rcisoft.business.cmsunitnewvideo.service.CmsUnitNewVideoService;
-import org.rcisoft.business.sysunit.service.impl.SysUnitServiceImpl;
 import org.rcisoft.business.sysuser.entity.AddSysUser;
 import org.rcisoft.business.sysuser.entity.SysUser;
 import org.rcisoft.business.sysuser.service.AdminSysUserService;
@@ -40,9 +39,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.URLEncoder;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * Created by cy on 2024年6月4日 上午10:19:34.
@@ -88,9 +85,9 @@ public class SysUserController extends CyPaginationController<SysUser> {
     @ApiOperation(value = "逻辑删除用户表", notes = "逻辑删除用户表")
     @ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = true, dataType = "varchar")})
     @DeleteMapping("/deleteLogical/{businessId:\\w+}/{unitId:\\w+}")
-    public CyResult deleteLogical(@PathVariable int businessId, @PathVariable String unitId ,SysUser sysUser) {
+    public CyResult deleteLogical(@PathVariable int businessId, @PathVariable String unitId, SysUser sysUser) {
         sysUser.setBusinessId(businessId);
-        if (!"null".equals(unitId)){
+        if (!"null".equals(unitId)) {
             sysUser.setUnitId(unitId);
         }
         CyPersistModel data = sysUserServiceImpl.removeLogical(sysUser);

src/main/resources/mapper/business/sysunit/mapper/SysUnitMapper.xml

@@ -336,7 +336,13 @@
         AND su.flag =1
         AND sun.del_flag = 0
         AND sun.flag = 1
-
+    </select>
+    <select id="findAllUnit" resultType="org.rcisoft.business.sysunit.entity.SysUnit">
+        SELECT sun.*
+        FROM sys_unit sun
+        WHERE 1 = 1
+          AND sun.del_flag = 0
+          AND sun.flag = 1
 
     </select>