小程序修改2

huimv-receive/src/main/java/com/huimv/receive/service/impl/SysAccountMultilevelServiceImpl.java

@@ -29,7 +29,7 @@ import java.util.Map;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author astupidcoder
@@ -49,50 +49,50 @@ public class SysAccountMultilevelServiceImpl extends ServiceImpl<SysAccountMulti
     public Result findUserAccount(String searchStr, int pageNum, int pageSize, Integer userId) {
 
         QueryWrapper<SysAccountMultilevel> wrapper = new QueryWrapper<>();
-        wrapper.like("pids",userId).or().eq("id",userId);
+        wrapper.like("pids", userId).or().eq("id", userId);
         IPage<SysAccountMultilevel> page = this.page(new Page<>(pageNum, pageSize), wrapper);
-        return new Result(ResultCode.SUCCESS,page);
+        return new Result(ResultCode.SUCCESS, page);
     }
 
     @Override
     public Result add(SysAccountMultilevel sysAccountMultilevel, Integer userId) {
 
         int account = this.count(new QueryWrapper<SysAccountMultilevel>().eq("account", sysAccountMultilevel.getAccount()));
-        if (account > 0 ){
-            return new Result(10001,"该账号已经存在，请重新创建",false);
+        if (account > 0) {
+            return new Result(10001, "该账号已经存在，请重新创建", false);
         }
         SysAccountMultilevel byId = this.getById(userId);
         sysAccountMultilevel.setPid(userId);
-        sysAccountMultilevel.setPids(byId.getPids()+","+userId);
+        sysAccountMultilevel.setPids(byId.getPids() + "," + userId);
         sysAccountMultilevel.setType(byId.getType());
         accountMultilevelMapper.insert(sysAccountMultilevel);
-        return  new Result( 10000,"添加成功",true);
+        return new Result(10000, "添加成功", true);
     }
 
     @Override
     public Result setAccountStatus(List<Integer> ids, Integer status) {
         try {
             for (Integer id : ids) {
-                SysAccountMultilevel account= new SysAccountMultilevel();
+                SysAccountMultilevel account = new SysAccountMultilevel();
                 account.setId(id);
                 account.setAccountStatus(status);
                 this.updateById(account);
             }
-        }catch (Exception e){
-            return new Result(10001,"插入失败",false);
+        } catch (Exception e) {
+            return new Result(10001, "插入失败", false);
         }
         String message = "";
-        if(status == 1){
+        if (status == 1) {
             message = "你选择的账号已经启用。";
-        }else{
+        } else {
             message = "你选择的账号已经暂停启用。";
         }
-        return new Result(10000,message,true);
+        return new Result(10000, message, true);
     }
 
     @Override
     public List<Integer> getAllChildId(Integer userId) {
-        List<SysAccountMultilevel> pids = this.list(new QueryWrapper<SysAccountMultilevel>().eq("pid", userId ));
+        List<SysAccountMultilevel> pids = this.list(new QueryWrapper<SysAccountMultilevel>().eq("pid", userId));
         List<Integer> list = new ArrayList<>();
         for (SysAccountMultilevel pid : pids) {
             list.add(pid.getId());
@@ -104,12 +104,12 @@ public class SysAccountMultilevelServiceImpl extends ServiceImpl<SysAccountMulti
     @Override
     public Result listSubordinate(String searchStr, int pageNum, int pageSize, Integer userId) {
         QueryWrapper<SysAccountMultilevel> wrapper = new QueryWrapper<>();
-        wrapper.like("pids",userId);
-        if (StringUtils.isNotBlank(searchStr)){
-            wrapper.like("user_name",searchStr);
+        wrapper.like("pids", userId);
+        if (StringUtils.isNotBlank(searchStr)) {
+            wrapper.like("user_name", searchStr);
         }
         IPage<SysAccountMultilevel> page = this.page(new Page<>(pageNum, pageSize), wrapper);
-        return new Result(ResultCode.SUCCESS,page);
+        return new Result(ResultCode.SUCCESS, page);
     }
 
     @Override
@@ -117,73 +117,72 @@ public class SysAccountMultilevelServiceImpl extends ServiceImpl<SysAccountMulti
         SysAccountMultilevel sysAccountMultilevel = accountMultilevelMapper.selectById(userId);
         Integer lastFarmId = sysAccountMultilevel.getLastFarmId();
         String farmIds = sysAccountMultilevel.getFarmIds();
-        if (farmIds == null){
-            return new Result(10001,"该账号没有绑定牧场",true);
+        if (farmIds == null) {
+            return new Result(10001, "该账号没有绑定牧场", true);
         }
-        if (lastFarmId == null){
+        if (lastFarmId == null) {
             String[] split = farmIds.split(",");
             String s = split[0];
             sysAccountMultilevel.setLastFarmId(Integer.valueOf(s));
             accountMultilevelMapper.updateById(sysAccountMultilevel);
-            return new Result(ResultCode.SUCCESS,s);
+            return new Result(ResultCode.SUCCESS, s);
         }
-        return new Result(ResultCode.SUCCESS,lastFarmId);
+        return new Result(ResultCode.SUCCESS, lastFarmId);
     }
 
     @Override
     public Result listSubordinateByFarm(String farmId, Integer userId) {
         QueryWrapper<SysAccountMultilevel> wrapper = new QueryWrapper<>();
-        wrapper.like("pids",userId);
-        wrapper.like("farm_ids",farmId);
-        List<SysAccountMultilevel> page = this.list( wrapper);
-        return new Result(ResultCode.SUCCESS,page);
+        wrapper.like("pids", userId);
+        wrapper.like("farm_ids", farmId);
+        List<SysAccountMultilevel> page = this.list(wrapper);
+        return new Result(ResultCode.SUCCESS, page);
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Result updateUser(HttpServletRequest httpServletRequest, MultipartFile img, String userName, String phone, Integer workPost, String workLocation, String workLocationId, String workName, String papersType, String papersCode) throws IOException {
         SysAccountMultilevel sysAccountMultilevel = accountMultilevelMapper.selectById(TokenSign.getMemberIdByJwtToken(httpServletRequest));
-        if (ObjectUtil.isNotEmpty(img)){
+        if (ObjectUtil.isNotEmpty(img)) {
             if (uploadImage.getImageCom(img).equals("上传失败")) {
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                return new Result(10001,"图片上传失败",false);
+                return new Result(10001, "图片上传失败", false);
             }
             sysAccountMultilevel.setImgUrl(uploadImage.getImageCom(img));
         }
-        if (ObjectUtil.isNotEmpty(userName)){
+        if (ObjectUtil.isNotEmpty(userName)) {
             sysAccountMultilevel.setUserName(userName);
         }
-        if (ObjectUtil.isNotEmpty(phone)){
+        if (ObjectUtil.isNotEmpty(phone)) {
             if (!PhoneNumberValidator.isValidPhoneNumber(phone)) {
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                return new Result(10001,"手机号格式错误！",false);
+                return new Result(10001, "手机号格式错误！", false);
             }
             sysAccountMultilevel.setPhone(phone);
         }
-        if (ObjectUtil.isNotEmpty(workPost)){
+        if (ObjectUtil.isNotEmpty(workPost)) {
             sysAccountMultilevel.setWorkPost(workPost.toString());
         }
-        if (ObjectUtil.isNotEmpty(workLocation)){
+        if (ObjectUtil.isNotEmpty(workLocation)) {
             sysAccountMultilevel.setWorkLocation(workLocation);
         }
-        if (ObjectUtil.isNotEmpty(workLocationId)){
+        if (ObjectUtil.isNotEmpty(workLocationId)) {
             sysAccountMultilevel.setWorkLocationType(Integer.parseInt(workLocationId));
         }
-        if (ObjectUtil.isNotEmpty(workName)){
+        if (ObjectUtil.isNotEmpty(workName)) {
             sysAccountMultilevel.setWorkName(workName);
         }
-        if (ObjectUtil.isNotEmpty(papersType)){
-            if (papersType.equals("0")){
-                if (!IDCardValidator.isValidIDCard(papersCode)){
-                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                    return new Result(10001,"身份证号格式错误!",false);
-                }
-            }
-            sysAccountMultilevel.setPapersType(papersType);
-            sysAccountMultilevel.setPapersCode(papersCode);
+
+
+        if (!IDCardValidator.isValidIDCard(papersCode)) {
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return new Result(10001, "身份证号格式错误!", false);
         }
+
+        sysAccountMultilevel.setPapersCode(papersCode);
+
         accountMultilevelMapper.updateById(sysAccountMultilevel);
-        return new Result(ResultCode.SUCCESS,sysAccountMultilevel);
+        return new Result(ResultCode.SUCCESS, sysAccountMultilevel);
     }
 
     @Override