commit

src/main/java/com/budwk/app/sys/controller/SysDataUserPullController.java

@@ -12,6 +12,8 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import org.nutz.dao.Cnd;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.sql.Sql;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
 import org.nutz.mvc.annotation.At;
@@ -40,6 +42,7 @@ public class SysDataUserPullController {
     @ApiOperation("分页数据")
     @Ok("json:{locked:'password|idCard|mobile'}")
     public Result pageData(@Valid SysDataUserPullPageForm pageForm) {
+        Sql sql = Sqls.create("select us.*,su.`name` AS unit_name from sys_user_source us left join sys_unit su ON su.id = us.unitId $condition");
         Cnd cnd = Cnd.NEW();
         cnd.andEX(Sys_user_source::getPullTime, "=", pageForm.getPullTime());
         cnd.and(Cnd.likeEX(Sys_user_source::getUsername, pageForm.getUserName()));
@@ -53,7 +56,8 @@ public class SysDataUserPullController {
             cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy()));
         }
         cnd.desc(Sys_user_source::getPullTime);
-        Pagination pagination = sysUserPullService.listPage(pageForm.getPageNumber(), pageForm.getPageSize(), cnd);
+        sql.setCondition(cnd);
+        Pagination pagination = sysUserPullService.listPage(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
         return Result.success(pagination);
     }
 

src/main/java/com/budwk/app/sys/controller/SysUnionController.java

@@ -334,7 +334,16 @@ public class SysUnionController {
         if (Lang.isEmpty(role)) {
             throw new BaseException("无法找到{}对应编码的角色", roleCode);
         }
-        sysRoleService.clear("sys_user_role", Cnd.where("roleId", "=", role.getId()).and("userId", "=", userId).and("unionId", "=", unionId));
+        Cnd cnd = Cnd.NEW();
+        cnd.and("roleId", "=", role.getId());
+        if (StrUtil.isNotBlank(userId)) {
+            cnd.and("userId", "=", userId);
+        } else {
+            cnd.and("userId", "is", null);
+        }
+        cnd.and("unionId", "=", unionId);
+
+        sysRoleService.clear("sys_user_role", cnd);
         sysRoleService.clearCache();
         sysUserService.clearCache();
         return Result.success();

src/main/java/com/budwk/app/sys/controller/SysUnionGroupController.java

@@ -5,12 +5,16 @@ import com.budwk.app.base.page.Pagination;
 import com.budwk.app.base.param.PageForm;
 import com.budwk.app.base.result.Result;
 import com.budwk.app.sys.models.Sys_union_group;
+import com.budwk.app.sys.models.Sys_unit;
 import com.budwk.app.sys.services.SysUnionGroupService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.nutz.aop.interceptor.ioc.TransAop;
+import org.nutz.dao.Cnd;
 import org.nutz.dao.Dao;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.sql.Sql;
 import org.nutz.ioc.aop.Aop;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
@@ -84,4 +88,31 @@ public class SysUnionGroupController {
     }
 
 
+    @At
+    @SaCheckPermission("sys.manager.union")
+    @ApiOperation("获取组成单位")
+    public Result getUnits(String unionId, String groupId){
+        Sql sql = Sqls.create("""
+                SELECT
+                  j.unitId
+                FROM
+                  sys_union_group,
+                  JSON_TABLE (unitIds, '$[*]' COLUMNS (unitId VARCHAR (50) PATH '$')) AS j
+                $condition
+                """);
+        Cnd cnd = Cnd.NEW();
+        cnd.and("unionId", "=", unionId);
+        cnd.andEX("id", "!=", groupId);
+        sql.setCondition(cnd);
+
+        sql.setCallback(Sqls.callback.strList());
+        dao.execute(sql);
+        List<String> list = sql.getList(String.class);
+
+        List<Sys_unit> unitList = dao.query(Sys_unit.class,
+                Cnd.where("unionId", "=", unionId)
+                        .and("unitTypeCode", "=", "1")
+                        .andEX("id", "not in", list));
+        return Result.success(unitList);
+    }
 }