ludc
2023-08-16 aa14c4477706ae01570c02b19538f03d0ace6bd6
修改checkRenAndExpr接口
已修改4个文件
18 ■■■■ 文件已修改
Source/UBCS-WEB/vue.config.js 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/constant/LauncherConstant.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/IUserService.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/vue.config.js
@@ -22,13 +22,13 @@
  },
  //开发模式反向代理配置,生产模式请使用Nginx部署并配置反向代理
  devServer: {
    port: 38000,
    port: 8080,
    proxy: {
      '/api': {
        //本地服务接口地址
        // target: 'http://localhost:37000',
        target: 'http://localhost:37000',
        // target: 'http://192.168.1.51:37000',
        target: 'http://dev.vci-tech.com:37000',
        // target: 'http://dev.vci-tech.com:37000',
        // target: 'http://192.168.1.104:37000',
        // target: 'http://192.168.0.105:37000',
        // target: 'http://192.168.0.103:37000',
Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/constant/LauncherConstant.java
@@ -40,8 +40,8 @@
    /**
     * nacos dev 地址
     */
    //String NACOS_DEV_ADDR = "dev.vci-tech.com:38848";
    String NACOS_DEV_ADDR = "localhost:8848";
    String NACOS_DEV_ADDR = "dev.vci-tech.com:38848";
    //String NACOS_DEV_ADDR = "localhost:8848";
    /**
     * nacos prod 地址
Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/IUserService.java
@@ -90,11 +90,9 @@
     * @return
     */
    List<User> selectAllUser(User user, Long deptId);
    /**
     * 获取所有
     *
     * @param user
     * @param deptId
     * @return
     */
    List<User>  selectAllUser();
Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java
@@ -173,6 +173,7 @@
        List<User> users = baseMapper.selectUserPage(user, deptIdList, (AuthUtil.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : AuthUtil.getTenantId()));
        return users;
    }
    @Override
    public List<User> selectAllUser(){
        LambdaQueryWrapper<User> wrapper=    Wrappers.lambdaQuery();
@@ -518,8 +519,9 @@
            return 0L;
        }
        QueryWrapper<User> wrapper = Wrappers.<User>query().eq("ID", userId);
        User dbUser = this.getOne(wrapper);
        //获取到密码修改时间
        Date pwdUpdateTime = this.getOne(wrapper).getPwdUpdateTime();
        Date pwdUpdateTime = Func.isNotEmpty(dbUser) ? dbUser.getPwdUpdateTime():new Date();
        Long pwdupdateday = 0L;
        if(!Func.isEmpty(pwdUpdateTime)){
            pwdupdateday = dateToDay(pwdUpdateTime);