分类授权数据授权,界面修改;业务类型修改表字段信息接口提示信息修改
已修改7个文件
22 ■■■■■ 文件已修改
Source/UBCS-WEB/src/components/Theme/ClassifyAuthDialog.vue 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/components/Theme/DataAuthDialog.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/UBCSCondition.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSynonymController.java 4 ●●●● 补丁 | 查看 | 原始文档 | 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-ddl/src/main/java/com/vci/ubcs/ddl/service/impl/DdlServiceImpl.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/ClassifyAuthServiceImpl.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/components/Theme/ClassifyAuthDialog.vue
@@ -118,7 +118,7 @@
    return {
      // 对话框显示控制
      isShowDialog: this.visible,
      isLoading: false,
      isLoading: true,
      tableHeight: "calc(100vh - 550px)",
      classifyAuthData: [],
      //列头
@@ -374,6 +374,7 @@
    // 加载授权列表
    loadAuthPage() {
      return new Promise((resolve, reject) => {
        this.isLoading = true;
        getButtonByParentCode({ code: "classifyTree" })
          .then((res) => {
            // 记录按钮数据
@@ -441,6 +442,7 @@
            });
          }
        });
        this.isLoading = false;
      });
    },
  },
Source/UBCS-WEB/src/components/Theme/DataAuthDialog.vue
@@ -104,7 +104,7 @@
    return {
      // 对话框显示控制
      isShowDialog: this.visible,
      isLoading: false,
      isLoading: true,
      tableHeight: 'calc(100vh - 550px)',
      classifyAuthData: [],
      //列头
@@ -369,7 +369,7 @@
    },
    loadAuthPage() {
      return new Promise((resolve, reject) => {
        // console.log(this.classifyData);
        this.isLoading = true;
        getButtonByParentCode({code: this.classifyData.attributes.id}).then(res => {
          // 记录按钮数据
          this.classifyAuthButton = res.data.data;
@@ -431,6 +431,7 @@
            })
          }
        });
        this.isLoading = false;
      });
    },
  },
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/UBCSCondition.java
@@ -213,7 +213,7 @@
                    String field = UBCSSqlKeyword.getColumn(key, "_notin");
                    sql = VciBaseUtil.toInSql(field,value);
                }else{
                    sql = VciBaseUtil.toInSql(key,value);
                    sql = key + "='" + value + "'";
                }
                if(!sql.isEmpty()){
                    whereSqlList.add(sql);
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSynonymController.java
@@ -17,13 +17,13 @@
package com.vci.ubcs.code.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.vci.ubcs.code.entity.CodeClassifyTemplateAttr;
import com.vci.ubcs.code.entity.CodeSynonym;
import com.vci.ubcs.code.service.ICodeSynonymService;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateAttrVO;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO;
import com.vci.ubcs.code.vo.pagemodel.CodeSynonymVO;
import com.vci.ubcs.code.wrapper.CodeSynonymWrapper;
import com.vci.ubcs.starter.util.UBCSCondition;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -80,7 +80,7 @@
    @ApiOperationSupport(order = 2)
    @ApiOperation(value = "", notes = "传入codeSynonym")
    public R<IPage<CodeSynonymVO>> list(@ApiIgnore @RequestParam Map<String, Object> condition,Query query) {
        IPage<CodeSynonym> page = codeSynonymService.page(Condition.getPage(query), Condition.getQueryWrapper(condition, CodeSynonym.class).lambda().orderByAsc(CodeSynonym::getCreateTime));
        IPage<CodeSynonym> page = codeSynonymService.page(Condition.getPage(query), UBCSCondition.getQueryWrapper(condition, CodeSynonym.class).lambda().orderByAsc(CodeSynonym::getCreateTime));
        return R.data(CodeSynonymWrapper.build().pageVO(page));
    }
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
@@ -563,7 +563,7 @@
        }
        if(StringUtils.isNotBlank(id) || StringUtils.isNotBlank(lcStatus) ){
            //String tableName = this.getTableName(treeQueryObject.getConditionMap().get("btmTypeId"),treeQueryObject.getConditionMap().get("id"), treeQueryObject.getConditionMap().get("lcStatus"));
            // TODO: 2024-1-24 23:25我去掉了懒加载,因为会影响数据授权过滤,而且这儿感觉没必要做懒加载
            // TODO: 2024-1-24 23:25我去掉了懒加载,因为会影响数据授权过滤和分类搜索功能,而且这儿感觉没必要做懒加载
            doList = codeClassifyMapper
                .selectCodeClassifyDOByTree(
                    treeQueryObject.getConditionMap().get("id"),
Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/service/impl/DdlServiceImpl.java
@@ -991,7 +991,8 @@
                changedList.addAll(checkDifferent(null,linkTypeList));
                removeLink(linkTypeList.toArray(new LinkTypeVO[0]));
            }
            R<List<ModifyAttributeInfo>> result = R.success("数据库操作成功");
            String msg = changedList.isEmpty() ? "数据库操作成功" : changedList.get(0).getHandleResult();
            R<List<ModifyAttributeInfo>> result = R.success(msg);
            result.setData(changedList);
            return result;
        } catch (Exception e) {
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/ClassifyAuthServiceImpl.java
@@ -165,8 +165,10 @@
                classifyAuths = this.classifyAuthMapper.selectList(
                    Wrappers.<ClassifyAuth>query()
                        .lambda().eq(ClassifyAuth::getClassifyId, classifyOidList.get(i))
                        .eq(ClassifyAuth::getAuthType,authType)
                        .in(ClassifyAuth::getRoleId, roleIds)
                );
                //只要当前节点的上层节点中找到了分类授权信息就不再继续网上找了
                if(!classifyAuths.isEmpty()){
                    break;
                }