【fix】修改账号逻辑

huimv-eartag2-platform/gateway/src/main/resources/application-dev.yml

@@ -14,6 +14,7 @@ spring:
             - Path=/admin/**
           filters:
             - StripPrefix=1
+
         - id: manage2
           uri: http://127.0.0.1:8099
           predicates:
@@ -21,6 +22,12 @@ spring:
           filters:
             - StripPrefix=1
 
+        - id: register2
+          uri: http://127.0.0.1:9090
+          predicates:
+            - Path=/register2/**
+          filters:
+            - StripPrefix=1
 logging:
   level:
     org.springframework.cloud.gateway: debug  # Gateway调试模式

huimv-eartag2-platform/huimv-eartag2-admin/src/main/java/com/huimv/eartag2/admin/controller/SysAccountMultilevelController.java

@@ -47,7 +47,22 @@ public class SysAccountMultilevelController {
         return accountMultilevelService.findUserAccount(searchStr,pageNum,pageSize,userId);
 
     }
+    //下层组织
+   /* @PostMapping("/listSubordinate")
+    public Result listSubordinate(@RequestBody Map map , HttpServletRequest request){
+
 
+        int pageNum = (Integer)map.get("pageNum");
+        int pageSize = (Integer)map.get("pageSize");
+        String searchStr = (String)map.get("searchStr");
+//        String orgId  = (String)map.get("orgId");
+//        if (StringUtils.isBlank(orgId)){
+        String  orgId = TokenSign.getOrgId(request);
+//        }
+
+        return accountMultilevelService.listSubordinate(searchStr,pageNum,pageSize,orgId);
+
+    }*/
     @PostMapping("/listSubordinate")
     public Result listSubordinate(@RequestBody Map map , HttpServletRequest request){
 
@@ -57,7 +72,7 @@ public class SysAccountMultilevelController {
         String searchStr = (String)map.get("searchStr");
 //        String orgId  = (String)map.get("orgId");
 //        if (StringUtils.isBlank(orgId)){
-        String  orgId = TokenSign.getOrgId(request);
+        Integer  orgId = TokenSign.getMemberIdByJwtToken(request);
 //        }
 
         return accountMultilevelService.listSubordinate(searchStr,pageNum,pageSize,orgId);

huimv-eartag2-platform/huimv-eartag2-admin/src/main/java/com/huimv/eartag2/admin/service/ISysAccountMultilevelService.java

@@ -26,7 +26,8 @@ public interface ISysAccountMultilevelService extends IService<SysAccountMultile
 
     List<Integer> getAllChildId(String orgId);
 
-    Result listSubordinate(String searchStr, int pageNum, int pageSize, String orgId);
+//    Result listSubordinate(String searchStr, int pageNum, int pageSize, String orgId);
+    Result listSubordinate(String searchStr, int pageNum, int pageSize, Integer orgId);
 
     Result getLastFarmId(Integer userId);
 

huimv-eartag2-platform/huimv-eartag2-admin/src/main/java/com/huimv/eartag2/admin/service/impl/SysAccountMultilevelServiceImpl.java

@@ -111,8 +111,8 @@ public class SysAccountMultilevelServiceImpl extends ServiceImpl<SysAccountMulti
         return list;
     }
 
-    @Override
-    public Result listSubordinate(String searchStr, int pageNum, int pageSize, String orgId) {
+//    @Override
+  /*  public Result listSubordinate(String searchStr, int pageNum, int pageSize, String orgId) {
 
         QueryWrapper<SysAccountMultilevel> wrapper = new QueryWrapper<>();
 
@@ -136,8 +136,21 @@ public class SysAccountMultilevelServiceImpl extends ServiceImpl<SysAccountMulti
 
         IPage<SysAccountMultilevel> page = this.page(new Page<>(pageNum, pageSize), wrapper);
         return new Result(ResultCode.SUCCESS,page);
-    }
+    }*/
+    @Override
+    public Result listSubordinate(String searchStr, int pageNum, int pageSize, Integer orgId) {
+
+        QueryWrapper<SysAccountMultilevel> wrapper = new QueryWrapper<>();
+
+//        wrapper.ne("id",orgId);
+        wrapper.like("pids",orgId);
+        if (StringUtils.isNotBlank(searchStr)){
+            wrapper.like("user_name",searchStr).or().like("account",searchStr);
+        }
 
+        IPage<SysAccountMultilevel> page = this.page(new Page<>(pageNum, pageSize), wrapper);
+        return new Result(ResultCode.SUCCESS,page);
+    }
     @Override
     public Result getLastFarmId(Integer userId) {
         SysAccountMultilevel sysAccountMultilevel = accountMultilevelMapper.selectById(userId);

huimv-eartag2-platform/huimv-eartag2-admin/src/main/resources/application-dev.yml

@@ -5,7 +5,7 @@ spring:
     name: huimv-eartag2-process
 
   datasource:
-    url: jdbc:mysql://122.112.224.199:3306/huimv-eartag-smart2?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://192.168.1.7:3306/huimv-demo-eartag20?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: root
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver