工人下拉添加权限

ruoyi-admin/src/main/java/com/ruoyi/web/controller/gas/GUserController.java

@@ -1,35 +1,31 @@
 package com.ruoyi.web.controller.gas;
 
-import java.util.List;
-import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
-
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.gas.domain.vo.GUserForemanVo;
-import com.ruoyi.system.aspect.annotation.DataDictClass;
-import lombok.RequiredArgsConstructor;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.*;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.core.validate.QueryGroup;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.gas.domain.vo.GUserVo;
 import com.ruoyi.gas.domain.bo.GUserBo;
+import com.ruoyi.gas.domain.vo.GUserVo;
 import com.ruoyi.gas.service.IGUserService;
-import com.ruoyi.common.core.page.TableDataInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * 用户Controller
@@ -130,8 +126,8 @@ public class GUserController extends BaseController {
      * @return
      */
     @GetMapping("/getWorker")
-    public AjaxResult getWorker() {
-        return AjaxResult.success(iGUserService.getWorker());
+    public AjaxResult getWorker(String type,String name) {
+        return AjaxResult.success(iGUserService.getWorker(type,name));
     }
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/web/controller/mobile/MUserController.java

@@ -74,7 +74,7 @@ public class MUserController extends BaseController {
      * @return
      */
     @GetMapping("/getWorker")
-    public AjaxResult getWorker() {
-        return AjaxResult.success(igUserService.getWorker());
+    public AjaxResult getWorker(String type,String name) {
+        return AjaxResult.success(igUserService.getWorker(type,name));
     }
 }

ruoyi-admin/src/main/resources/application-dev.yml

@@ -57,12 +57,12 @@ spring:
 #          url: jdbc:mysql://123.249.30.140:3307/gas?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
 #          username: root
 #          password: szrqwx123456
-          url: jdbc:mysql://49.232.253.249:3306/sj_zdsz_new?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
-          username: root
-          password: Lanyuxinxi@88.com
-#          url: jdbc:mysql://121.37.40.217:13306/zdsz?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
-#          username: zdsz
-#          password: ZDSZ1a2b3c4d%...
+#          url: jdbc:mysql://49.232.253.249:3306/sj_zdsz_new?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
+#          username: root
+#          password: Lanyuxinxi@88.com
+          url: jdbc:mysql://121.37.40.217:13306/zdsz?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+          username: zdsz
+          password: ZDSZ1a2b3c4d%...
 #          szrqwx123456
         # 从库数据源
         slave:

ruoyi-admin/src/main/resources/application.yml

@@ -25,7 +25,7 @@ captcha:
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为8080
-  port: 8081
+  port: 8080
   servlet:
     # 应用的访问路径
     context-path: /

ruoyi-gas/src/main/java/com/ruoyi/gas/mapper/GUserMapper.java

@@ -20,7 +20,7 @@ import java.util.List;
 public interface GUserMapper extends BaseMapperPlus<GUser> {
 
     Page<GUserVo> getList(@Param("p")GUserBo bo, Page<?> page);
-    List<GUserForemanVo>  getWorker();
+    List<GUserForemanVo>  getWorker(@Param("type") String type,@Param("name") String name);
     Page<GUserVo> getBlacklist(@Param("p")GUserBo bo, Page<?> page);
     List<GCensusVo> getExamineForeman(Long foremanId);
     List<GCensusVo> getExamineWorker(Long workerId);

ruoyi-gas/src/main/java/com/ruoyi/gas/service/IGUserService.java

@@ -63,7 +63,7 @@ public interface IGUserService extends IServicePlus<GUser, GUserVo> {
 	 * 工人下拉
 	 * @return
 	 */
-	List<GUserForemanVo>  getWorker();
+	List<GUserForemanVo>  getWorker(String type,String name);
 
 	/**
 	 * 黑名单列表

ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GAreaServiceImpl.java

@@ -101,13 +101,14 @@ public class GAreaServiceImpl extends ServicePlusImpl<GAreaMapper, GArea, GAreaV
     public TableDataInfo<GAreaVo> queryPageList(GAreaBo bo) {
         PagePlus<GArea, GAreaVo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
         result.getRecordsVo().forEach(item -> {
-            for (String uid : item.getUserId().split(",")) {
-                System.out.println(uid);
-                GUserVo voById = gUserService.getVoById(uid);
-                if (ObjectUtils.isEmpty(voById))
-                    continue;
-                item.setUserName(StringUtils.isEmpty(item.getUserName()) ? voById.getName() : item.getUserName() + "," + voById.getName());
-            }
+            if (StringUtils.isNotEmpty(item.getUserId()))
+                for (String uid : item.getUserId().split(",")) {
+                    System.out.println(uid);
+                    GUserVo voById = gUserService.getVoById(uid);
+                    if (ObjectUtils.isEmpty(voById))
+                        continue;
+                    item.setUserName(StringUtils.isEmpty(item.getUserName()) ? voById.getName() : item.getUserName() + "," + voById.getName());
+                }
         });
         return PageUtils.buildDataInfo(result);
     }

ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GUserServiceImpl.java

@@ -116,8 +116,8 @@ public class GUserServiceImpl extends ServicePlusImpl<GUserMapper, GUser, GUserV
 
 
     @Override
-    public List<GUserForemanVo> getWorker() {
-        return gUserMapper.getWorker();
+    public List<GUserForemanVo> getWorker(String type,String name) {
+        return gUserMapper.getWorker(type,name);
     }
 
     @Override

ruoyi-gas/src/main/resources/mapper/GUserMapper.xml

@@ -40,6 +40,14 @@
                name as name
         from g_user
         where del_flag = '0'
+        <if test="name != null  and name != ''">
+            and name LIKE CONCAT('%',#{name},'%')
+        </if>
+        <if test="type != null  and type != ''">
+            <foreach item="item" index="index" collection="type.split(',')" >
+                and power like CONCAT('%',#{item},'%')
+            </foreach>
+        </if>
     </select>
     <select id="getBlacklist" resultType="com.ruoyi.gas.domain.vo.GUserVo">
         SELECT q.*