设备，车辆接口修改

Administrator

2021-08-28 7327c2b113573bccaeef5b3fc5c82011abc00cd8

 src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java

@@ -26,6 +26,7 @@
import org.springblade.common.cache.ParamCache;
import org.springblade.common.cache.SysCache;
import org.springblade.common.cache.UserCache;
import org.springblade.common.constant.AgeUtil;
import org.springblade.common.constant.CommonConstant;
import org.springblade.common.constant.TenantConstant;
import org.springblade.common.enums.DictEnum;
@@ -139,7 +140,15 @@

   @Override
   public IPage<UserVO> selectUserPages(IPage<UserVO> page, UserVO user) {
      return page.setRecords(baseMapper.selectUserPages(page, user));
      List<UserVO> userVOS = baseMapper.selectUserPages(page, user);
      userVOS.forEach(userVO -> {
         if (null!=userVO.getCardid() && userVO.getCardid()!=""){
            userVO.setAge(AgeUtil.idCardToAge(userVO.getCardid()));
         }else {
            userVO.setAge(null);
         }
      });
      return page.setRecords(userVOS);
   }

   @Override
@@ -335,8 +344,11 @@
         }
         //设置部门id
         user.setDeptId(userDeptService.selectIn(user.getDeptId()));
         //设置账号
         user.setAccount(user.getCardid());
         //获取默认密码配置
         user.setPassword(ParamCache.getValue(DEFAULT_PARAM_PASSWORD));
         user.setPassword(user.getCardid().substring(user.getCardid().length()-6));
//         user.setPassword(ParamCache.getValue(DEFAULT_PARAM_PASSWORD));
         //新增
         this.submit(user);
      });
@@ -577,8 +589,11 @@
         }
         //设置部门id
         user.setDeptId(userDeptService.selectIn(user.getDeptId()));
         //设置账号
         user.setAccount(user.getCardid());
         //获取默认密码配置
         user.setPassword(ParamCache.getValue(DEFAULT_PARAM_PASSWORD));
         user.setPassword(user.getCardid().substring(user.getCardid().length()-6));
//         user.setPassword(ParamCache.getValue(DEFAULT_PARAM_PASSWORD));
         //新增
         this.submit(user);
      });
@@ -594,4 +609,20 @@
   public UserVO getUserInfoBySecurityNumber(String securityNumber) {
      return baseMapper.getUserInfoBySecurityNumber(securityNumber);
   }


   /**
    * 保安员信息
    * @param user
    * @return
    */
   @Override
   public UserVO getUserDetails(User user) {
      return baseMapper.getUserDetails(user);
   }

   @Override
   public List<Map<String, Object>> seleL(String type,String deptid, String jurisdiction) {
      return baseMapper.seleL(type,deptid, jurisdiction);
   }
}