ludc
2023-10-31 885d8364166b6e952e0af2eb4cf4e44c59544b96
新增用户界面去掉岗位
已修改9个文件
已添加5个文件
157 ■■■■■ 文件已修改
Source/UBCS-WEB/src/views/system/user.vue 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-ops-api/pom.xml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-ops-api/ubcs-log-api/pom.xml 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/entity/SystemLog.java 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-ops/ubcs-log/pom.xml 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/core/log/controller/LogSystemController.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/core/log/service/ILogSystemService.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/core/log/service/impl/LogSystemServiceImpl.java 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/revision/service/RevisionModelUtil.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/VciBaseUtil.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-user/pom.xml 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/views/system/user.vue
@@ -294,6 +294,7 @@
        viewBtn: true,
        editBtn: true,
        delBtn: true,
        addBtn: true,
        dialogType: 'drawer',
        dialogClickModal: false,
        highlightCurrentRow: true, //行选中时高亮
@@ -562,7 +563,7 @@
                  trigger: "click"
                }]
              },
              {
              /*{
                label: "所属岗位",
                prop: "postId",
                type: "tree",
@@ -577,7 +578,7 @@
                  message: "请选择所属岗位",
                  trigger: "click"
                }],
              },
              },*/
            ]
          },
        ]
@@ -930,7 +931,7 @@
    rowSave(row, done, loading) {
        row.deptId = row.deptId.join(",");
        row.roleId = row.roleId.join(",");
        row.postId = row.postId.join(",");
        //row.postId = row.postId.join(",");
        // console.log('3',row)
        add(row).then(() => {
          this.initFlag = false;
Source/UBCS/ubcs-ops-api/pom.xml
@@ -18,6 +18,7 @@
    <modules>
        <module>ubcs-flow-api</module>
        <module>ubcs-resource-api</module>
        <module>ubcs-log-api</module>
    </modules>
    <dependencies>
Source/UBCS/ubcs-ops-api/ubcs-log-api/pom.xml
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <parent>
        <artifactId>ubcs-ops-api</artifactId>
        <groupId>com.vci.ubcs</groupId>
        <version>3.0.1.RELEASE</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>ubcs-log-api</artifactId>
    <properties>
        <maven.compiler.source>8</maven.compiler.source>
        <maven.compiler.target>8</maven.compiler.target>
    </properties>
</project>
Source/UBCS/ubcs-ops-api/ubcs-log-api/src/main/java/com/vci/ubcs/log/entity/SystemLog.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,34 @@
package com.vci.ubcs.log.entity;
/**
 * @author ludc
 * @date 2023/10/31 15:43
 */
public class SystemLog {
    /**
     * æœåŠ¡åç§°
     */
    private String serviceName;
    /**
     * æœåŠ¡id
     */
    private String serviceId;
    /**
     * æ—¥å¿—路径
     */
    private String logPath;
    /**
     * æ—¥å¿—名称
     */
    private String logName;
    /**
     * æ—¥å¿—类型
     */
    private String logType;
}
Source/UBCS/ubcs-ops/ubcs-log/pom.xml
@@ -38,6 +38,12 @@
            <artifactId>orai18n</artifactId>
            <version>${orai18n.version}</version>
        </dependency>
        <dependency>
            <groupId>com.vci.ubcs</groupId>
            <artifactId>ubcs-log-api</artifactId>
            <version>3.0.1.RELEASE</version>
            <scope>compile</scope>
        </dependency>
    </dependencies>
    <build>
Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/core/log/controller/LogSystemController.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,22 @@
package com.vci.ubcs.core.log.controller;
import lombok.AllArgsConstructor;
import org.springblade.core.tenant.annotation.NonDS;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
 * æœ¬åœ°ç³»ç»Ÿæ—¥å¿—
 * @author ludc
 * @date 2023/10/31 15:37
 */
@NonDS
@RestController
@AllArgsConstructor
@RequestMapping("/systemLog")
public class LogSystemController {
}
Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/core/log/service/ILogSystemService.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
package com.vci.ubcs.core.log.service;
import com.vci.ubcs.log.entity.SystemLog;
import java.util.List;
/**
 * æœ¬åœ°ç³»ç»Ÿæ—¥å¿—
 * @author ludc
 * @date 2023/10/31 15:38
 */
public interface ILogSystemService {
    /**
     * èŽ·å–æœ¬åœ°æ—¥å¿—åˆ—è¡¨
     */
    List<SystemLog> getSystemLogList();
}
Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/core/log/service/impl/LogSystemServiceImpl.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
package com.vci.ubcs.core.log.service.impl;
import com.vci.ubcs.core.log.service.ILogSystemService;
import com.vci.ubcs.log.entity.SystemLog;
import java.util.List;
/**
 * æœ¬åœ°ç³»ç»Ÿæ—¥å¿—
 * @author ludc
 * @date 2023/10/31 15:39
 */
public class LogSystemServiceImpl implements ILogSystemService {
    @Override
    public List<SystemLog> getSystemLogList() {
        return null;
    }
}
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/revision/service/RevisionModelUtil.java
@@ -57,7 +57,7 @@
                    });
                    tree.setOid((String)oidValues.stream().collect(Collectors.joining(wrapperOptions.getOidValueSep())));
                    tree.setName((String) VciBaseUtil.getValueFromField("name", doObject));
                    tree.setCount("("+(String)VciBaseUtil.getValueFromField("total", doObject)+")");
                    tree.setCount("【"+(String)VciBaseUtil.getValueFromField("total", doObject)+"】");
                    if (f != null) {
                        tree.setText((String)f.apply(doObject));
                    } else {
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/VciBaseUtil.java
@@ -883,7 +883,7 @@
    }
    public static String getTableName(String btmname,Boolean isMdmTable) {
        return (isMdmTable ? "PLBT_CODE_" : "PL_CODE_") + btmname.trim().toLowerCase();
        return (isMdmTable ? "PLBT_CODE_" : "PL_CODE_") + btmname.trim().toUpperCase(Locale.ROOT);
    }
    public static Field getTsField(Class c) {
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
@@ -585,7 +585,7 @@
        if(Func.isEmpty(codeClassify) || Func.isEmpty(codeClassify.getBtmTypeId())){
            throw new ServiceException("查询主数据总数时,未获取业务类型ID!");
        }
        return VciBaseUtil.getTableName(codeClassify.getBtmTypeId().toLowerCase(Locale.ROOT),true);
        return VciBaseUtil.getTableName(codeClassify.getBtmTypeId(),true);
    }
    /**
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml
@@ -300,7 +300,7 @@
            SELECT
                COUNT(*)
            FROM
                PLBT_CODE_part
                ${tableName}
            WHERE
                CODECLSFID IN (
                    SELECT
Source/UBCS/ubcs-service/ubcs-user/pom.xml
@@ -47,6 +47,12 @@
            <artifactId>orai18n</artifactId>
            <version>${orai18n.version}</version>
        </dependency>
        <dependency>
            <groupId>com.vci.ubcs</groupId>
            <artifactId>ubcs-util-api</artifactId>
            <version>3.0.1.RELEASE</version>
            <scope>compile</scope>
        </dependency>
    </dependencies>
    <build>
Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java
@@ -22,6 +22,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import com.vci.ubcs.system.cache.DictCache;
import com.vci.ubcs.system.cache.NacosConfigCache;
import com.vci.ubcs.system.cache.ParamCache;
@@ -77,16 +78,13 @@
    private final IUserOauthService userOauthService;
    private final ISysClient sysClient;
    private final BladeTenantProperties tenantProperties;
    //拿到配置的超管
    private final NacosConfigCache nacosConfigCache;
    @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean submit(User user) {
        if (StringUtil.isBlank(user.getTenantId())) {
            // user.setTenantId(nacosConfigCache.getAdminUserInfo().getTenantId());
            // é»˜è®¤è®¾ç½®ä¸ºç®¡ç†ç»„下的用户
            user.setTenantId(nacosConfigCache.getAdminUserInfo().getTenantId());
            user.setTenantId(NacosConfigCache.getAdminUserInfo().getTenantId());
        }
        String tenantId = user.getTenantId();
        //Tenant tenant = SysCache.getTenant(tenantId);
@@ -106,7 +104,7 @@
        Boolean flag = true;
        for (User user : users){
            if (StringUtil.isBlank(user.getTenantId())) {
                user.setTenantId(nacosConfigCache.getAdminUserInfo().getTenantId());
                user.setTenantId(NacosConfigCache.getAdminUserInfo().getTenantId());
            }
            String tenantId = user.getTenantId();
            if (Func.isNotEmpty(user.getPassword())) {
@@ -166,7 +164,7 @@
    @Override
    public List<User> selectAllUser(User user, Long deptId){
        List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
        List<User> users = baseMapper.selectUserPage(user, deptIdList, (AuthUtil.getTenantId().equals(nacosConfigCache.getAdminUserInfo().getTenantId()) ? StringPool.EMPTY : AuthUtil.getTenantId()));
        List<User> users = baseMapper.selectUserPage(user, deptIdList, (VciBaseUtil.checkAdminTenant() ? StringPool.EMPTY : AuthUtil.getTenantId()));
        return users;
    }
@@ -514,7 +512,7 @@
    @Override
    public Long checkRenAndExpr(Long userId) {
        //超级管理员直接返回不需要提醒密码修改
        if(nacosConfigCache.getAdminUserInfo().getUserId().equals(userId)){
        if(NacosConfigCache.getAdminUserInfo().getUserId().equals(userId)){
            return 0L;
        }
        QueryWrapper<User> wrapper = Wrappers.<User>query().eq("ID", userId);