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);