Merge remote-tracking branch 'origin/master'

 Source/UBCS-WEB/src/api/system/user.js

@@ -159,4 +159,17 @@
    }
  })
}
//单点登录接口
export const oaSsos =(userName) => {
  return request({
    url: '/api/ubcs-code/passwordFree/oaSsos',
    method: 'post',
    params:{
      userName
    },
    headers: {
      'empCode': 'ZVKcWmOH1JvFYaM7BuNVm1BWbaw6OcMi04aAT2H+X3Y='
    },
  })
}


 Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue

@@ -23,7 +23,8 @@
      </el-button-group>
      <el-button-group>
        <!--    ä¿å­˜-->
        <el-button v-if="(!checkStatus|| crudLCStatus=='Editing') && editOpenFlag" icon="el-icon-check" plain size="small"
        <el-button v-if="(!checkStatus|| crudLCStatus=='Editing') && editOpenFlag" icon="el-icon-check" plain
                   size="small"
                   type="success" @click.prevent="addsHandler">保存
        </el-button>
        <!--    é¢„览排序-->
@@ -67,11 +68,14 @@
      </el-button-group>
      <!-- æ˜¯å¦å¼€å¯ç¼–辑     -->
      <el-button-group>
        <el-button v-if="(!checkStatus|| crudLCStatus=='Editing') && !editOpenFlag && attrEditVisible == false && attrFlagChiledren==false" icon="el-icon-view" plain
                   size="small"
                   @click="editOpen">开启编辑
        <el-button
          v-if="(!checkStatus|| crudLCStatus=='Editing') && !editOpenFlag && attrEditVisible == false && attrFlagChiledren==false"
          icon="el-icon-view" plain
          size="small"
          @click="editOpen">开启编辑
        </el-button>
        <el-select v-if="(!checkStatus || crudLCStatus=='Editing') && editOpenFlag" v-model="selectvalue" placeholder="请选择"
        <el-select v-if="(!checkStatus || crudLCStatus=='Editing') && editOpenFlag" v-model="selectvalue"
                   placeholder="请选择"
                   size="small">
          <el-option
            v-for="item in selectoptions"
@@ -325,17 +329,20 @@
                       align="center"
      >
        <template slot-scope="{ row }">
          <el-input v-if="editingRows === row && editShows== item.prop && item.prop != 'codeDateFormat' && (item.edit == 'text'  ||item.edit == 'refer' )"
                    :ref="'input' + row.oid"
                    v-show="!AddCellFlag"
                    v-model="row[item.prop]"
                    @blur="saveRows(row)"
                    ></el-input>
          <el-input-number v-if="editingRows === row && editShows== item.prop && item.edit == 'number'" v-model="row[item.prop]"
          <el-input
            v-if="editingRows === row && editShows== item.prop && item.prop != 'codeDateFormat' && (item.edit == 'text'  ||item.edit == 'refer' )"
            v-show="!AddCellFlag"
            :ref="'input' + row.oid"
            v-model="row[item.prop]"
            @blur="saveRows(row)"
          ></el-input>
          <el-input-number v-if="editingRows === row && editShows== item.prop && item.edit == 'number'"
                           v-model="row[item.prop]"
                           :style="{width:(item.width-10)+'px'}"
                           controls-position="right"
                           size="small" @blur="saveRows"></el-input-number>
          <el-select v-if="editingRows === row && editShows== item.prop && item.edit == 'select' " slot="prepend" v-model="row[item.prop]" allow-create default-first-option
          <el-select v-if="editingRows === row && editShows== item.prop && item.edit == 'select' " slot="prepend"
                     v-model="row[item.prop]" allow-create default-first-option
                     filterable
                     @blur="selectChangeHandler(item.editConfig,index)">
            <el-option
@@ -455,16 +462,6 @@
        }
      }
    },
    // editingRows:{
    //   handler(newval,oldval){
    //     if(newval){
    //       const inputElement = document.querySelector(`#inputRef${newval.oid}`);
    //       if (inputElement) {
    //         inputElement.focus();
    //       };
    //     }
    //   }
    // },
    ProData: {
      handler(newval, oldval) {
        if (newval) {
@@ -495,7 +492,7 @@
  data() {
    return {
      // ä¿å­˜å•å…ƒæ ¼çŠ¶æ€
      AddCellFlag:false,
      AddCellFlag: false,
      //全屏编辑高度状态
      editStyleFlag: false,
      loading: false,
@@ -1091,12 +1088,12 @@
          {
            label: "属性英文名称",
            prop: "id",
            width:100,
            width: 100,
          },
          {
            label: "属性中文名称",
            prop: "name",
            width:100,
            width: 100,
          },
          {
            label: "长度",
@@ -1802,7 +1799,7 @@
          this.editOpenFlag = false;
          // è°ƒç”¨çˆ¶ç»„件修改按钮状态
          this.$emit('editCloseChildren')
          this.AddCellFlag=true;
          this.AddCellFlag = true;
        }).catch(() => {
          this.$message.warning('保存失败，请查看控制台输出！')
        });
@@ -2024,7 +2021,13 @@
    },
    //分类注入保存
    injectAddHandle() {
      const { classifyInvokeAttr, classifyInvokeAttrName, classifyInvokeLevel, classifyInvokeEditFlag, classifyNumber } = this.injectOption;
      const {
        classifyInvokeAttr,
        classifyInvokeAttrName,
        classifyInvokeLevel,
        classifyInvokeEditFlag,
        classifyNumber
      } = this.injectOption;

      const data = {
        "注入类型": classifyInvokeAttr,
@@ -2112,7 +2115,7 @@
        this.editStyleFlag = true;
        this.attrEditVisible = true;
        this.attrFlag = true;
        this.AddCellFlag=true;
        this.AddCellFlag = true;
      }

    },
@@ -2126,7 +2129,7 @@
    updataFormlaContent(val) {
      if (this.CurrentCell) {
        this.$set(this.CurrentCell, 'componentRule', val.replace(/"/g, ''))
        this.componentRuleText= this.CurrentCell.componentRule
        this.componentRuleText = this.CurrentCell.componentRule
      } else {
        this.$set(this.attrRow, 'componentRule', val.replace(/"/g, ''))
      }
@@ -2148,7 +2151,7 @@
    //开启编辑
    editOpen() {
      this.editOpenFlag = true;
      this.AddCellFlag=false;
      this.AddCellFlag = false;
    },
    //定义一个关闭编辑的方法供子组件使用
    editClose() {

 Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue

@@ -286,8 +286,12 @@
          text.push(itemText);
        }
      })

      let mapFields =Object.assign(this.referConfig.fieldMap,JSON.parse(this.options.mapFields)) ;
      let mapFields;
      if (this.options.mapFields == "") {
        mapFields = this.referConfig.fieldMap;
      } else {
        mapFields = Object.assign(this.referConfig.fieldMap, JSON.parse(this.options.mapFields));
      }
      this.value=value.join(',');
      this.text=text.join(',')
      this.$emit("setValue", {field:this.referConfig.field,showField:this.referConfig.showField,value:this.value,text:this.text,rawData:this.selectionList,fieldMap:mapFields});

 Source/UBCS-WEB/src/page/login/sso.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,69 @@
<template>
  <p>测试</p>
</template>

<script>
import {oaSsos} from "@/api/system/user.js"
import {mapGetters} from "vuex";
import {setStore} from "@/util/store";

export default {
  name: "sso",
  data() {
    return {
      loginForm:{
        //租户ID
        tenantId: "",
        //部门ID
        deptId: "",
        //角色ID
        roleId: "",
        //用户名
        username: "",
        //密码
        password: "",
        selectInput: '',
        //下拉input数据
        value: '管理组',
        //下拉菜单
        region: [],
        //账号类型
        type: "account",
        //验证码的索引
        key: "",
        //预加载白色背景
        image: "data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7",

      },
    }
  },
  computed: {
    ...mapGetters(["tagWel", "userInfo"])
  },
  created() {

  },
  methods: {
    // Onload() {
    //   let name = 'pwdfree'
    //   oaSsos(name).then(res=>{
    //     console.log(res)
    //     if(res.status === 200){
    //       // this.loginForm.tenantId=res.data.tenant_id;
    //       // this.loginForm.username=res.data.user_name;
    //       this.$store.dispatch("LoginBySso").then((res) => {
    //         console.log('res',res)
    //           this.$router.push({path: this.tagWel.value});
    //       })
    //       // console.log(this.tagWel)
    //       // this.$router.push({path: this.tagWel.value});
    //     }
    //   })
    // }
  }
}
</script>

<style scoped>

</style>

 Source/UBCS-WEB/src/page/login/userlogin.vue

@@ -49,15 +49,16 @@
      </el-form-item>
      <!--密码修改弹出框-->
    </el-form>
    <el-dialog title="修改密码" :visible.sync="dialogFormVisible" append-to-body @closed="closehandle" :close-on-press-escape="false" >
      <el-form :model="form"  :rules="rules">
        <el-form-item label="原密码" :label-width="formLabelWidth" prop="oldPassword">
    <el-dialog :close-on-press-escape="false" :visible.sync="dialogFormVisible" append-to-body title="修改密码"
               @closed="closehandle">
      <el-form :model="form" :rules="rules">
        <el-form-item :label-width="formLabelWidth" label="原密码" prop="oldPassword">
          <el-input v-model="form.oldPassword" autocomplete="off"></el-input>
        </el-form-item>
        <el-form-item label="新密码" :label-width="formLabelWidth" prop="newPassword">
        <el-form-item :label-width="formLabelWidth" label="新密码" prop="newPassword">
          <el-input v-model="form.newPassword" autocomplete="off"></el-input>
        </el-form-item>
        <el-form-item label="确认密码" :label-width="formLabelWidth" prop="newPassword1">
        <el-form-item :label-width="formLabelWidth" label="确认密码" prop="newPassword1">
          <el-input v-model="form.newPassword1" autocomplete="off"></el-input>
        </el-form-item>
      </el-form>
@@ -74,38 +75,39 @@
import {mapGetters} from "vuex";
import {info} from "@/api/system/tenant";
import {getTopUrl} from "@/util/util";
import {updatePassword} from "@/api/system/user.js"
import {oaSsos, updatePassword} from "@/api/system/user.js"
import {removeToken} from "@/util/auth";
import md5 from "js-md5";

export default {
  name: "userlogin",
  data() {
    return {
      tenantMode: this.website.tenantMode,
      ButtonList: [],
      dialogFormVisible:false,
      dialogFormVisible: false,
      form: {
        oldPassword: '',
        newPassword: '',
        newPassword1: '',
      },
      loginRules:{
        username:[
          { required: true, message: '请输入账号', trigger: 'blur' }
      loginRules: {
        username: [
          {required: true, message: '请输入账号', trigger: 'blur'}
        ],
        password: [
          { required: true, message: '请输入密码', trigger: 'blur' }
          {required: true, message: '请输入密码', trigger: 'blur'}
        ],
      },
      rules: {
        oldPassword: [
          { required: true, message: '请输入原密码', trigger: 'blur' }
          {required: true, message: '请输入原密码', trigger: 'blur'}
        ],
        newPassword:[
          { required: true, message: '请输入新密码', trigger: 'blur' }
        newPassword: [
          {required: true, message: '请输入新密码', trigger: 'blur'}
        ],
        newPassword1:[
          { required: true, message: '请输确认密码', trigger: 'blur' }
        newPassword1: [
          {required: true, message: '请输确认密码', trigger: 'blur'}
        ]
      },
      loginForm: {
@@ -156,11 +158,115 @@
  created() {
    this.getTenant();
    //这里是浏览器的一个bug，突然出现的目前找不到原因，新的浏览器打开此项目。localStorage会少存储一个名为saber-permission的数据，少了这条数据租户管理界面会缺少几个按钮和样式
    //还有一种情况，当我们手动删除这条数据或者清空localStorage后，再刷新进入页面它也不存储这个变量，所以我就在这写死了存储，目前效果没有问题
    localStorage.setItem("saber-permission",JSON.stringify({"dataType":"object","content":{"flow_model_create":true,"flow_model_update":true,"flow_model_deploy":true,"flow_model_download":true,"flow_model_delete":true,"work_start_flow":true,"work_start_image":true,"oss_add":true,"oss_edit":true,"oss_delete":true,"oss_view":true,"oss_enable":true,"role_add":true,"role_edit":true,"role_delete":true,"role_view":true,"notice_add":true,"notice_edit":true,"notice_delete":true,"notice_view":true,"user_add":true,"user_edit":true,"user_delete":true,"user_role":true,"user_reset":true,"user_view":true,"log_usual_view":true,"code_add":true,"code_edit":true,"code_delete":true,"code_view":true,"region_add":true,"region_delete":true,"region_import":true,"region_export":true,"region_debug":true,"work_claim_sign":true,"work_claim_detail":true,"work_claim_follow":true,"work_todo_handle":true,"work_todo_detail":true,"work_todo_follow":true,"data_scope_setting":true,"datasource_add":true,"datasource_edit":true,"datasource_delete":true,"datasource_view":true,"attach_upload":true,"attach_download":true,"attach_delete":true,"dept_add":true,"dept_edit":true,"dept_delete":true,"dept_view":true,"log_api_view":true,"flow_manager_state":true,"flow_manager_image":true,"flow_manager_remove":true,"work_send_detail":true,"work_send_follow":true,"sms_add":true,"sms_edit":true,"sms_delete":true,"sms_view":true,"sms_enable":true,"api_scope_setting":true,"log_error_view":true,"post_add":true,"post_edit":true,"post_delete":true,"post_view":true,"flow_follow_delete":true,"work_done_detail":true,"work_done_follow":true,"dict_add":true,"dict_edit":true,"dict_delete":true,"dict_view":true,"dictbiz_add":true,"dictbiz_edit":true,"dictbiz_delete":true,"dictbiz_view":true,"menu_add":true,"menu_edit":true,"menu_delete":true,"menu_view":true,"topmenu_add":true,"topmenu_edit":true,"topmenu_delete":true,"topmenu_view":true,"topmenu_setting":true,"param_add":true,"param_edit":true,"param_delete":true,"param_view":true,"tenant_add":true,"tenant_edit":true,"tenant_delete":true,"tenant_view":true,"client_add":true,"client_edit":true,"client_delete":true,"client_view":true},"datetime":1678352291697}))
    localStorage.setItem("saber-permission", JSON.stringify({
      "dataType": "object", "content": {
        "flow_model_create": true,
        "flow_model_update": true,
        "flow_model_deploy": true,
        "flow_model_download": true,
        "flow_model_delete": true,
        "work_start_flow": true,
        "work_start_image": true,
        "oss_add": true,
        "oss_edit": true,
        "oss_delete": true,
        "oss_view": true,
        "oss_enable": true,
        "role_add": true,
        "role_edit": true,
        "role_delete": true,
        "role_view": true,
        "notice_add": true,
        "notice_edit": true,
        "notice_delete": true,
        "notice_view": true,
        "user_add": true,
        "user_edit": true,
        "user_delete": true,
        "user_role": true,
        "user_reset": true,
        "user_view": true,
        "log_usual_view": true,
        "code_add": true,
        "code_edit": true,
        "code_delete": true,
        "code_view": true,
        "region_add": true,
        "region_delete": true,
        "region_import": true,
        "region_export": true,
        "region_debug": true,
        "work_claim_sign": true,
        "work_claim_detail": true,
        "work_claim_follow": true,
        "work_todo_handle": true,
        "work_todo_detail": true,
        "work_todo_follow": true,
        "data_scope_setting": true,
        "datasource_add": true,
        "datasource_edit": true,
        "datasource_delete": true,
        "datasource_view": true,
        "attach_upload": true,
        "attach_download": true,
        "attach_delete": true,
        "dept_add": true,
        "dept_edit": true,
        "dept_delete": true,
        "dept_view": true,
        "log_api_view": true,
        "flow_manager_state": true,
        "flow_manager_image": true,
        "flow_manager_remove": true,
        "work_send_detail": true,
        "work_send_follow": true,
        "sms_add": true,
        "sms_edit": true,
        "sms_delete": true,
        "sms_view": true,
        "sms_enable": true,
        "api_scope_setting": true,
        "log_error_view": true,
        "post_add": true,
        "post_edit": true,
        "post_delete": true,
        "post_view": true,
        "flow_follow_delete": true,
        "work_done_detail": true,
        "work_done_follow": true,
        "dict_add": true,
        "dict_edit": true,
        "dict_delete": true,
        "dict_view": true,
        "dictbiz_add": true,
        "dictbiz_edit": true,
        "dictbiz_delete": true,
        "dictbiz_view": true,
        "menu_add": true,
        "menu_edit": true,
        "menu_delete": true,
        "menu_view": true,
        "topmenu_add": true,
        "topmenu_edit": true,
        "topmenu_delete": true,
        "topmenu_view": true,
        "topmenu_setting": true,
        "param_add": true,
        "param_edit": true,
        "param_delete": true,
        "param_view": true,
        "tenant_add": true,
        "tenant_edit": true,
        "tenant_delete": true,
        "tenant_view": true,
        "client_add": true,
        "client_edit": true,
        "client_delete": true,
        "client_view": true
      }, "datetime": 1678352291697
    }))
  },
  mounted() {
    //在mounted获取首页下拉菜单数据
    this.$axios.get('/api/ubcs-system/tenant/tenant-map').then(res => {
      if (res.data.code == 200) {
        this.loginForm.tenantId = res.data.data[0].TENANT_ID;
@@ -193,26 +299,29 @@
  },
  props: [],
  methods: {
    ChandleLogin(){

    ChandleLogin() {
      this.$store.dispatch("LoginBySso").then((res) => {
        console.log('res', res)
        this.$router.push({path: this.tagWel.value});
      })
    },
    closehandle(){
    closehandle() {
      removeToken()
    },
    delok(){
    delok() {
      //点击取消或者x æ¸…除token关闭弹窗 æ¸…除token后会自动重新获取用户信息 è¿™é‡Œæ²¡æœ‰é‡æ–°è°ƒç”¨æ–¹æ³•ï¼Œå› ä¸ºä¸‹é¢é€»è¾‘有点绕，怕重新掉有bug直接清除token重新获取用户信息
      this.dialogFormVisible = false;
      removeToken()
    },
    // ç‚¹å‡»ç¡®å®šä¿®æ”¹å¯†ç 
    addHandler(){
    addHandler() {
      this.dialogFormVisible = false
      updatePassword(md5(this.form.oldPassword), this.form.newPassword, this.form.newPassword1).then(res=>{
      updatePassword(md5(this.form.oldPassword), this.form.newPassword, this.form.newPassword1).then(res => {
        console.log(res)
        if(res.data.code==200){
        if (res.data.code == 200) {
          this.$message({
            type:"success",
            message:"修改成功！"
            type: "success",
            message: "修改成功！"
          })
          this.$router.push({path: this.tagWel.value})
        }
@@ -239,8 +348,9 @@

    },
    handleLogin: function () {
      debugger
      this.userInfo = this.$store.state.upadatastatus
      localStorage.setItem('username',this.loginForm.username)
      localStorage.setItem('username', this.loginForm.username)
      this.$refs.loginForm.validate(valid => {
        if (valid) {
          const loading = this.$loading({
@@ -251,37 +361,37 @@
          this.$store.dispatch("LoginByUsername", this.loginForm).then(() => {
            //上面又加了一层判断的意思是如果是超管不进行判断 æš‚时加上这个判断的话，登录会有bug，点击登录刷新后才进入，先简单在下面判断是否为空，只有超管的strategyUpdateStatus为空
            // if(this.userInfo.user_id != '0' && this.userInfo.tenant_id !== '000000'){
              //判断如果不等于0就是策略密码没有修改走下面逻辑
              if (this.userInfo.strategyUpdateStatus == 0 || this.userInfo.strategyUpdateStatus==null) {
                if (this.website.switchMode) {
                  const deptId = this.userInfo.dept_id;
                  const roleId = this.userInfo.role_id;
                  if (deptId.includes(",") || roleId.includes(",")) {
                    this.loginForm.deptId = deptId;
                    this.loginForm.roleId = roleId;
                    this.userBox = true;
                    this.$store.dispatch("LogOut").then(() => {
                      loading.close();
                    });
                  }
            //判断如果不等于0就是策略密码没有修改走下面逻辑
            if (this.userInfo.strategyUpdateStatus == 0 || this.userInfo.strategyUpdateStatus == null) {
              if (this.website.switchMode) {
                const deptId = this.userInfo.dept_id;
                const roleId = this.userInfo.role_id;
                if (deptId.includes(",") || roleId.includes(",")) {
                  this.loginForm.deptId = deptId;
                  this.loginForm.roleId = roleId;
                  this.userBox = true;
                  this.$store.dispatch("LogOut").then(() => {
                    loading.close();
                  });
                }
                this.$router.push({path: this.tagWel.value});
              } else {
                //等于0说明密码策略被修改，提示用户修改密码，给一个修改弹框
                this.$message({
                  type: "warning",
                  message: "密码策略已被修改，请重新修改密码！"
                })
                setTimeout(()=>{
                  this.dialogFormVisible=true
                },1500)
              }
              this.$router.push({path: this.tagWel.value});
            } else {
              //等于0说明密码策略被修改，提示用户修改密码，给一个修改弹框
              this.$message({
                type: "warning",
                message: "密码策略已被修改，请重新修改密码！"
              })
              setTimeout(() => {
                this.dialogFormVisible = true
              }, 1500)
            }

            // }
            //把判断密码策略修改的值存进本地，然后再路由权限js文件里面获取再做判断，不然刷新会进入首页（因为在有id和token的情况下，刷新页面或者进入登录页会自动进入首页）
            //index页面也可以用到这个值来判断是否是超管身份登录来判断是否提醒过期时间等
            localStorage.setItem("updataid",JSON.stringify(this.userInfo))
            localStorage.setItem("userId",this.userInfo.user_id)
            localStorage.setItem("updataid", JSON.stringify(this.userInfo))
            localStorage.setItem("userId", this.userInfo.user_id)
            loading.close();
          }).catch(() => {
            loading.close();

 Source/UBCS-WEB/src/router/page/index.js

@@ -12,6 +12,17 @@
  }
},
  {
    path: '/sso',
    name: '单点测试页',
    component: () =>
      import( /* webpackChunkName: "page" */ '@/page/login/sso'),
    meta: {
      keepAlive: true,
      isTab: false,
      isAuth: false
    }
  },
  {
    path: '/lock',
    name: '锁屏页',
    component: () =>

 Source/UBCS-WEB/src/store/modules/user.js

@@ -5,6 +5,7 @@
import {deepClone} from '@/util/util'
import website from '@/config/website'
import {loginByUsername, loginBySocial, loginBySso, getUserInfo, logout, refreshToken, getButtons} from '@/api/user'
import {oaSsos} from "@/api/system/user.js"
import {getTopMenu, getRoutes} from '@/api/system/menu'
import md5 from 'js-md5'

@@ -109,9 +110,9 @@
      })
    },
    //根据单点信息登录
    LoginBySso({commit}, userInfo) {
    LoginBySso({commit}) {
      return new Promise((resolve) => {
        loginBySso(userInfo.state,).then(res => {
        oaSsos().then(res => {
          const data = res.data;
          if (data.error_description) {
            Message({

 Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/revision/service/RevisionModelUtil.java

@@ -9,6 +9,7 @@
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springblade.core.tool.utils.StringUtil;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;

@@ -107,4 +108,108 @@
        }
    }

    public <T, R> List<Tree> doListSystemClassTrees(List<T> doList, TreeWrapperOptions wrapperOptions, Function<T, R> f) {
        if (CollectionUtils.isEmpty(doList)) {
            return new ArrayList();
        } else {
            List<Tree> allTree = new ArrayList();
            List<Tree> children = new ArrayList();
            Iterator var6 = doList.iterator();

            while(true) {
                while(var6.hasNext()) {
                    T doObject = (T) var6.next();
                    Tree tree = new Tree();
                    List<String> oidFieldNames = VciBaseUtil.str2List(wrapperOptions.getOidFieldName());
                    List<String> oidValues = new LinkedList();
                    oidFieldNames.stream().forEach((s) -> {
                        oidValues.add(VciBaseUtil.getStringValueFromObject(VciBaseUtil.getValueFromField("oid", doObject)));
                    });
                    tree.setOid((String)oidValues.stream().collect(Collectors.joining(wrapperOptions.getOidValueSep())));
                    tree.setName((String) VciBaseUtil.getValueFromField("name", doObject));
                    if (f != null) {
                        tree.setText((String)f.apply(doObject));
                    } else {
                        List<String> textFieldNames = VciBaseUtil.str2List(wrapperOptions.getTextFieldName());
                        List<String> textValues = new LinkedList();
                        textFieldNames.stream().forEach((s) -> {
                            textValues.add(VciBaseUtil.getStringValueFromObject(VciBaseUtil.getValueFromField(s, doObject)));
                        });
                        tree.setText((String)textValues.stream().collect(Collectors.joining(wrapperOptions.getTextValueSep())));
                    }

                    if (StringUtils.isNotBlank(wrapperOptions.getParentFieldName())) {
                        String stringValueFromObject = VciBaseUtil.getStringValueFromObject(VciBaseUtil.getValueFromField(wrapperOptions.getParentFieldName(), doObject));
                        tree.setParentId(stringValueFromObject);
                    }

                    if (wrapperOptions.isAllAttributes()) {
                        try {
                            tree.setAttributes(VciBaseUtil.objectToMapString(doObject));
                        } catch (Exception var13) {
                            if (this.logger.isErrorEnabled()) {
                                this.logger.error("把对象转换为map时出现了错误，但是不影响树的展示，对业务可能有影响");
                            }
                        }
                    }

                    if (wrapperOptions.isMultipleSelect() || wrapperOptions.isShowCheckBox()) {
                        tree.setShowCheckbox(true);
                    }

                    if (wrapperOptions.getParentOid() == null) {
                        wrapperOptions.setParentOid("");
                    }

                    if (!StringUtils.isBlank(tree.getParentId()) && (!StringUtils.isNotBlank(wrapperOptions.getParentOid()) || !wrapperOptions.getParentOid().equalsIgnoreCase(tree.getParentId()))) {
                        children.add(tree);
                    } else {
                        allTree.add(tree);
                    }
                }

                (new Tree()).findSystemClassChild(allTree, children);
                if (allTree.size() <= 0) {
                    allTree.addAll(children);
                }

                return allTree;
            }
        }
    }
//
//    public void findSystemClassChild(List<Tree> treenode, List<Tree> children) {
//        Tree node;
//        for(Iterator var3 = treenode.iterator(); var3.hasNext(); {
//            if (var3 == null) {
//                var3.next();
//            } else {
//                ((Tree) var3.next()).getChildren().add(node);
//            }
//        }) {
//            node = (Tree)var3.next();
//            Iterator var5 = children.iterator();
//
//            while(var5.hasNext()) {
//                Tree childnode = (Tree)var5.next();
//                if (node.getAttributes().get("classifyOid").equalsIgnoreCase(childnode.getParentId())) {
//                    childnode.setParentName(node.getText());
//                    if (StringUtil.isBlank(childnode.getParentBtmName())) {
//                        childnode.setParentBtmName((String)node.getAttributes().getOrDefault("btmname", ""));
//                    }
//
//                    node.getChildren().add(childnode);
//                }
//            }
//
//            if (node.getChildren().size() > 0) {
//                this.findSystemClassChild(node.getChildren(), children);
//                node.setLeaf(false);
//            } else {
//                node.setLeaf(true);
//            }
//        }
//
//    }

}

 Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/pagemodel/Tree.java

@@ -207,6 +207,33 @@

    }

    public void findSystemClassChild(List<Tree> treenode, List<Tree> children) {
        Tree node;
        for(Iterator var3 = treenode.iterator(); var3.hasNext(); this.getChildren().add(node)) {
            node = (Tree)var3.next();
            Iterator var5 = children.iterator();

            while(var5.hasNext()) {
                Tree childnode = (Tree)var5.next();
                if (node.getAttributes().get("classifyOid").equalsIgnoreCase(childnode.getParentId())) {
                    childnode.setParentName(node.getText());
                    if (StringUtil.isBlank(childnode.getParentBtmName())) {
                        childnode.setParentBtmName((String)node.getAttributes().getOrDefault("btmname", ""));
                    }

                    node.getChildren().add(childnode);
                }
            }

            if (node.getChildren().size() > 0) {
                this.findSystemClassChild(node.getChildren(), children);
                node.setLeaf(false);
            } else {
                node.setLeaf(true);
            }
        }

    }
    @Override
    public String toString() {
        return "Tree{oid='" + this.oid + '\'' + ", text='" + this.text + '\'' + ", leaf=" + this.leaf + ", showCheckbox=" + this.showCheckbox + ", checked=" + this.checked + ", children=" + this.children + ", icon='" + this.icon + '\'' + ", iconCls='" + this.iconCls + '\'' + ", parentId='" + this.parentId + '\'' + ", parentName='" + this.parentName + '\'' + ", parentBtmName='" + this.parentBtmName + '\'' + ", expanded=" + this.expanded + ", href='" + this.href + '\'' + ", index='" + this.index + '\'' + ", attributes=" + this.attributes + '}';

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplyWebManagementController.java

@@ -1,11 +1,16 @@
package com.vci.ubcs.code.controller;


import com.vci.ubcs.code.dto.CodeClassifyTemplateAttrDTO;
import com.vci.ubcs.code.entity.SystemClassifyRole;
import com.vci.ubcs.code.service.ICodeApplyWebManagementService;
import com.vci.ubcs.code.service.ICodeClassifyService;
import com.vci.ubcs.starter.web.pagemodel.Tree;
import lombok.AllArgsConstructor;
import org.springblade.core.tool.api.R;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import java.util.List;

/**
 * ä¸»é¢˜åº“定义表 æŽ§åˆ¶å™¨
@@ -21,6 +26,8 @@
     * åˆ†ç±»æœåŠ¡å¯¹è±¡
     */
    private final ICodeClassifyService codeClassifyService;

    private final ICodeApplyWebManagementService codeApplyWebManagementService;

    /***
     * æ ¹æ®å‰ç«¯é€‰æ‹©çš„分类权限授权授权
@@ -45,5 +52,14 @@
        return R.success("查询成功");
    }

    @PostMapping( "/batchAddSave")
    public R batchAddSave(@RequestBody List<SystemClassifyRole> list,String systemOid,String systemId){
        return codeApplyWebManagementService.batchAddSave(list,systemOid,systemId);
    }

    @GetMapping("/getSystemClassifyRoleTree")
    public List<Tree> getSystemClassifyRoleTree(String systemOid,String systemId){
        return codeApplyWebManagementService.getSystemClassifyRoleTree(systemOid,systemId);
    }

}

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/SystemClassifyRoleMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,10 @@
package com.vci.ubcs.code.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.vci.ubcs.code.entity.SystemClassifyRole;

import java.util.List;

public interface SystemClassifyRoleMapper extends BaseMapper<SystemClassifyRole> {
    public List<SystemClassifyRole> getListSystemClassifyRole(String systemOid, String systemId);
}

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeApplyWebManagementService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,14 @@
package com.vci.ubcs.code.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.vci.ubcs.code.entity.SystemClassifyRole;
import com.vci.ubcs.starter.web.pagemodel.Tree;
import org.springblade.core.tool.api.R;

import java.util.List;

public interface ICodeApplyWebManagementService extends IService<SystemClassifyRole> {
    R batchAddSave(List<SystemClassifyRole> list,String systemOid,String systemId);

    List<Tree> getSystemClassifyRoleTree(String systemOid, String systemId);
}

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeApplyWebManagementServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,81 @@
package com.vci.ubcs.code.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vci.ubcs.code.entity.SystemClassifyRole;
import com.vci.ubcs.code.enumpack.FrameworkDataLCStatus;
import com.vci.ubcs.code.mapper.SystemClassifyRoleMapper;
import com.vci.ubcs.code.service.ICodeApplyWebManagementService;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO;
import com.vci.ubcs.starter.revision.model.TreeWrapperOptions;
import com.vci.ubcs.starter.revision.service.RevisionModelUtil;
import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
import com.vci.ubcs.starter.web.pagemodel.Tree;
import jodd.util.StringUtil;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.Date;
import java.util.Iterator;
import java.util.List;

@Service
public class CodeApplyWebManagementServiceImpl extends ServiceImpl<SystemClassifyRoleMapper, SystemClassifyRole> implements ICodeApplyWebManagementService {

    /**
     * ä¸Šçº§èŠ‚点的属性名称
     */
    public static  final String PARENT_FIELD_NAME = "classParentOid";

    /**
     * å¯¹è±¡çš„操作
     */
    @Resource
    private RevisionModelUtil revisionModelUtil;


    @Override
    public R batchAddSave(List<SystemClassifyRole> roleList,String systemOid,String systemId) {
        if(roleList.size() == 0){
            return R.fail("传入数据为空，请确认！！");
        }
        //先删除，再保存
        QueryWrapper<SystemClassifyRole> wrapper = new QueryWrapper<>();
        wrapper.eq("systemOid",systemOid);
        wrapper.eq("systemId",systemId);
        this.remove(wrapper);
        //数据处理
        roleList.stream().forEach(systemClassifyRole -> {
            if(StringUtil.isBlank(systemClassifyRole.getOid())){
                DefaultAttrAssimtUtil.addDefaultAttrAssimt(systemClassifyRole,"systemClassifyRole");
                systemClassifyRole.setSystemId(systemId);
                systemClassifyRole.setSystemOid(systemOid);
            }else{
                systemClassifyRole.setCreator(String.valueOf(AuthUtil.getUser().getUserId()));
                systemClassifyRole.setCreateTime(new Date());
                systemClassifyRole.setLastModifier(String.valueOf(AuthUtil.getUser().getUserId()));
                systemClassifyRole.setLastModifyTime(new Date());
                systemClassifyRole.setTs(new Date());
            }
            systemClassifyRole.setTenantId(AuthUtil.getTenantId());
        });
        //保存
        this.saveBatch(roleList);
        return R.success("操作成功");
    }

    @Override
    public List<Tree> getSystemClassifyRoleTree(String systemOid, String systemId) {
        List<SystemClassifyRole> listSystemClassifyRole = baseMapper.getListSystemClassifyRole(systemOid, systemId);
        TreeWrapperOptions treeWrapperOptions = new TreeWrapperOptions(PARENT_FIELD_NAME);
        treeWrapperOptions.setOidFieldName("CLASSIFYOID");
        List<Tree> tree= revisionModelUtil.doListSystemClassTrees(listSystemClassifyRole,treeWrapperOptions,(SystemClassifyRole s) ->{
            //可以在这里处理树节点的显示
            return s.getClassifyId() + " " + s.getName() + (FrameworkDataLCStatus.DISABLED.getValue().equalsIgnoreCase(s
                .getLcStatus()) ? (" ã€åœç”¨ã€‘ ") : "");
        });
        return tree;
    }
}

 Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/SystemClassifyRoleMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,82 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.vci.ubcs.code.mapper.SystemClassifyRoleMapper">
    <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
    <resultMap id="plSystemClassifyRoleMap" type="com.vci.ubcs.code.entity.SystemClassifyRole">
        <result column="OID" property="oid"/>
        <result column="REVISIONOID" property="revisionOid"/>
        <result column="NAMEOID" property="nameOid"/>
        <result column="BTMNAME" property="btmname"/>
        <result column="LASTR" property="lastR"/>
        <result column="FIRSTR" property="firstR"/>
        <result column="LASTV" property="lastV"/>
        <result column="FIRSTV" property="firstV"/>
        <result column="CREATOR" property="creator"/>
        <result column="CREATETIME" property="createTime"/>
        <result column="LASTMODIFIER" property="lastModifier"/>
        <result column="LASTMODIFYTIME" property="lastModifyTime"/>
        <result column="REVISIONRULE" property="revisionRule"/>
        <result column="VERSIONRULE" property="versionRule"/>
        <result column="REVISIONSEQ" property="revisionSeq"/>
        <result column="REVISIONVALUE" property="revisionValue"/>
        <result column="VERSIONSEQ" property="versionSeq"/>
        <result column="VERSIONVALUE" property="versionValue"/>
        <result column="LCTID" property="lctid"/>
        <result column="LCSTATUS" property="lcStatus"/>
        <result column="TS" property="ts"/>
        <result column="ID" property="id"/>
        <result column="NAME" property="name"/>
        <result column="DESCRIPTION" property="description"/>
        <result column="OWNER" property="owner"/>
        <result column="COPYFROMVERSION" property="copyFromVersion"/>
        <result column="TENANT_ID" property="tenantId"/>
        <result column="SYSTEMOID" property="systemOid"/>
        <result column="SYSTEMID" property="systemId"/>
        <result column="CLASSIFYOID" property="classifyOid"/>
        <result column="CLASSIFYID" property="classifyId"/>
        <result column="SELECTED" property="selected"/>
        <result column="CLASSPARENTOID" property="classParentOid"/>
    </resultMap>
    <select id="getListSystemClassifyRole" resultType="com.vci.ubcs.code.entity.SystemClassifyRole">
        select pc.OID,
               pc.REVISIONOID,
               pc.NAMEOID,
               pc.BTMNAME,
               pc.LASTR,
               pc.FIRSTR,
               pc.LASTV,
               pc.FIRSTV,
               pc.CREATOR,
               pc.CREATETIME,
               pc.LASTMODIFIER,
               pc.LASTMODIFYTIME,
               pc.REVISIONRULE,
               pc.VERSIONRULE,
               pc.REVISIONSEQ,
               pc.REVISIONVALUE,
               pc.VERSIONSEQ,
               pc.VERSIONVALUE,
               pc.LCTID,
               pc.LCSTATUS,
               pc.TS,
               pc.ID,
               p.NAME,
               pc.DESCRIPTION,
               pc.OWNER,
               pc.COPYFROMVERSION,
               pc.GROUPCODE,
               pc.TENANT_ID,
               pc.SYSTEMOID,
               pc.SYSTEMID,
               p.oid CLASSIFYOID,
               p.id CLASSIFYID,
               case when pc.selected is null then 'false' else  pc.SELECTED end SELECTED,
               p.PARENTCODECLASSIFYOID CLASSPARENTOID
        from PL_CODE_CLASSIFY p ,
             PL_CODE_SYSTEM_CLASSIFY_ROLE pc
        where p.oid = pc.CLASSIFYOID(+)
          and '${systemOid}' = pc.SYSTEMOID(+)
          and '${systemId}' = pc.SYSTEMID(+)
    </select>

</mapper>