后台登录

admin/src/main/java/com/huimv/farm/damsubsidy/controller/SysGroupController.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huimv.farm.damsubsidy.common.token.TokenSign;
 import com.huimv.farm.damsubsidy.common.utils.Result;
+import com.huimv.farm.damsubsidy.common.utils.ResultCode;
 import com.huimv.farm.damsubsidy.entity.AccountGroup;
 import com.huimv.farm.damsubsidy.entity.Group;
 import com.huimv.farm.damsubsidy.entity.SysUser;
@@ -51,11 +52,19 @@ public class SysGroupController {
     }
 
     @PostMapping("/list")
-    public IPage<Group> listGroup(@RequestBody Map map , HttpServletRequest request) {
+    public Result listGroup(@RequestBody Map map , HttpServletRequest request) {
         Long userId = TokenSign.getMemberIdByJwtToken(request);
         List<Long> allChildId = sysUserService.getAllChildId(userId);
-        return groupService.listGroup(map,allChildId);
+        return  new Result(ResultCode.SUCCESS,groupService.listGroup(map,allChildId));
+    }
 
+   /* @PostMapping("/list")
+    public Result listGroup(@RequestBody Map map , HttpServletRequest request) {
+        String orgId = TokenSign.getOrgId(request);
+        Integer userId = TokenSign.getMemberIdByJwtToken(request);
 
-    }
+        List<Integer> allChildId = accountMultilevelService.getAllChildId(orgId);
+        allChildId.add(userId);
+        return new Result(ResultCode.SUCCESS,groupService.listGroup(map,allChildId));
+    }*/
 }

admin/src/main/java/com/huimv/farm/damsubsidy/service/impl/BillIsolatedServiceImpl.java

@@ -146,7 +146,7 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
                 if (end.length() != 3){
                     return new Result(10001,"耳标号格式错误",false);
                 }
-                String substring1 = eartags.substring(start.length() - end.length(), end.length()+1);
+                String substring1 = eartags.substring(start.length() - end.length(), start.length());
                 String substring = start.substring(0, start.length() - end.length());
                 System.out.println(substring);
                 List<String> eartagNos = new ArrayList<>();
@@ -285,7 +285,7 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
                         if (end.length() != 3){
                             return new Result(10001,"耳标号格式错误",false);
                         }
-                        String substring1 = s.substring(start.length() - end.length(), end.length()+1);
+                        String substring1 = s.substring(start.length() - end.length(), start.length());
                         String substring = start.substring(0, start.length() - end.length());
                         System.out.println(substring);
                         List<String> eartagNos = new ArrayList<>();
@@ -316,7 +316,7 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
                     if (end.length() != 3){
                         return new Result(10001,"耳标号格式错误",false);
                     }
-                    String substring1 = deaths.substring(start.length() - end.length(), end.length()+1);
+                    String substring1 = deaths.substring(start.length() - end.length(), start.length());
                     String substring = start.substring(0, start.length() - end.length());
                     System.out.println(substring);
                     List<String> eartagNos = new ArrayList<>();