From 360accaf390a8541a325936522ad863ef7b04632 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 27 十二月 2023 16:40:23 +0800
Subject: [PATCH] 密码修改对话框修改，密码修改原密码传参修改
---
Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java | 4 +-
/dev/null | 6 ---
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/IClassifyAuthService.java | 8 ++++
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/IMenuService.java | 6 +++
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/ClassifyAuthServiceImpl.java | 50 +++++++++++++++++++++---
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/ClassifyAuthController.java | 12 ++++++
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MenuServiceImpl.java | 23 ++++++++++-
Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/MenuMapper.xml | 1
8 files changed, 93 insertions(+), 17 deletions(-)
diff --git a/Source/.idea/.gitignore b/Source/.idea/.gitignore
deleted file mode 100644
index 13566b8..0000000
--- a/Source/.idea/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Editor-based HTTP Client requests
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
diff --git a/Source/.idea/Source.iml b/Source/.idea/Source.iml
deleted file mode 100644
index d6ebd48..0000000
--- a/Source/.idea/Source.iml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" inherit-compiler-output="true">
- <exclude-output />
- <content url="file://$MODULE_DIR$" />
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- </component>
-</module>
\ No newline at end of file
diff --git a/Source/.idea/easyCodeTableSetting.xml b/Source/.idea/easyCodeTableSetting.xml
deleted file mode 100644
index 993a4b5..0000000
--- a/Source/.idea/easyCodeTableSetting.xml
+++ /dev/null
@@ -1,694 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="EasyCodeTableSetting">
- <option name="tableInfoMap">
- <map>
- <entry key="UBCS_MDM.PL_CODE_BASICSEC">
- <value>
- <TableInfoDTO>
- <option name="fullColumn">
- <list>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="oid" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="revisionoid" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="nameoid" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="btmname" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="lastr" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="firstr" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="lastv" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="firstv" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="creator" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="createtime" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="lastmodifier" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="lastmodifytime" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="revisionrule" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="versionrule" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="revisionseq" />
- <option name="type" value="java.lang.Long" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="revisionvalue" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="versionseq" />
- <option name="type" value="java.lang.Long" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="versionvalue" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="lctid" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="lcstatus" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="ts" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="id" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="name" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="description" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="owner" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="copyfromversion" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="sectype" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="pkcoderule" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="ordernum" />
- <option name="type" value="java.lang.Long" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="getvalueclass" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="codedateformatstr" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="codeseclengthtype" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="codeseclength" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="codeleveltype" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="codelevelvalue" />
- <option name="type" value="java.lang.Long" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="valuecutlength" />
- <option name="type" value="java.lang.Long" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="valuecuttype" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="codegetvaluetype" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="refercodeclassifyoid" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="referconfig" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="refervalueinfo" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="filtersql" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="serialstart" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="serialstep" />
- <option name="type" value="java.lang.Long" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="codefilltype" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="codefilltypetext" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="codefillseparator" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="codefilllength" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="codefilllimit" />
- <option name="type" value="java.lang.Long" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="codefillflag" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="customcodeserialclass" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="matchclassifyvalueflag" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="parentclassifysecoid" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="nullableflag" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="componentcodeflag" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="serialdependflag" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="displayflag" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="serialdependorder" />
- <option name="type" value="java.lang.Long" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="referattributename" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="referattributeid" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="referbtmname" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="referbtmid" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- </list>
- </option>
- <option name="name" value="PlCodeBasicsec" />
- <option name="preName" value="" />
- <option name="saveModelName" value="ubcs-omd-api" />
- <option name="savePackageName" value="" />
- <option name="savePath" value="$USER_HOME$/Desktop" />
- <option name="templateGroupName" value="Default" />
- </TableInfoDTO>
- </value>
- </entry>
- <entry key="UBCS_MDM.PL_CODE_REFERCONFIG">
- <value>
- <TableInfoDTO>
- <option name="comment" value="鍙傜収閰嶇疆琛�" />
- <option name="fullColumn">
- <list>
- <ColumnInfoDTO>
- <option name="comment" value="涓婚敭" />
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="oid" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="revisionoid" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="nameoid" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="btmname" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="lastr" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="firstr" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="lastv" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="firstv" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="creator" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="createtime" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="revisionseq" />
- <option name="type" value="java.lang.Long" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="revisionvalue" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="versionseq" />
- <option name="type" value="java.lang.Long" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="versionvalue" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="lctid" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="lcstatus" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="ts" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="name" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="description" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="owner" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="copyfromversion" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="ordernum" />
- <option name="type" value="java.lang.Long" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="comment" value="鍙傜収鐨勪笟鍔＄被鍨�" />
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="refertype" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="comment" value="鏄剧ず鐨勫睘鎬�" />
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="textfield" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="comment" value="瀛樺偍鍊肩殑灞炴��" />
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="valuefield" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="comment" value="鍙傜収绐楀彛绫诲瀷" />
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="type" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="comment" value="鑷畾涔夌殑鍚庡彴璺緞" />
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="url" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="comment" value="鏈嶅姟鐨勫湴鍧�" />
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="backpath" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="comment" value="璇锋眰鍚庡彴鐨勫崗璁柟寮�" />
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="method" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="comment" value="绐楀彛鏄剧ず鐨勯珮搴�" />
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="height" />
- <option name="type" value="java.lang.Long" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="comment" value="杩囨护灞炴�ц姹傚弬鏁�" />
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="paramforformkey" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="comment" value="鏄惁澶氶��" />
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="ismuti" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="comment" value="鏄犲皠鍏朵粬灞炴��" />
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="mapfields" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="comment" value="鍙傝�冪殑UI涓婁笅鏂�" />
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="refercontent" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="comment" value="骞冲彴鐨勮〃鏍肩紪鍙�" />
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="displaytable" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="comment" value="姣忛〉鏄剧ず鏉℃暟" />
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="limit" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="comment" value="鎺掑簭瀛楁" />
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="sortfield" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="comment" value="鎺掑簭绫诲瀷" />
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="sorttype" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="comment" value="鏍戝舰鐨勪笂绾у睘鎬�" />
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="parentfieldname" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="comment" value="涓婄骇灞炴�у�煎搴斿睘鎬�" />
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="parentusedfield" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="comment" value="鏍硅妭鐐圭殑鍊�" />
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="parentvalue" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="comment" value="鏍戝姞杞芥柟寮�" />
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="loadtype" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- <ColumnInfoDTO>
- <option name="comment" value="鏄惁鍙兘閫夋嫨鍙跺瓙鑺傜偣" />
- <option name="custom" value="false" />
- <option name="ext" value="{}" />
- <option name="name" value="onlyleaf" />
- <option name="type" value="java.lang.String" />
- </ColumnInfoDTO>
- </list>
- </option>
- <option name="name" value="PlCodeReferconfig" />
- <option name="preName" value="" />
- <option name="saveModelName" value="" />
- <option name="savePackageName" value="" />
- <option name="savePath" value="" />
- <option name="templateGroupName" value="" />
- </TableInfoDTO>
- </value>
- </entry>
- </map>
- </option>
- </component>
-</project>
\ No newline at end of file
diff --git a/Source/.idea/misc.xml b/Source/.idea/misc.xml
deleted file mode 100644
index 59780fe..0000000
--- a/Source/.idea/misc.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="ProjectType">
- <option name="id" value="jpab" />
- </component>
-</project>
\ No newline at end of file
diff --git a/Source/.idea/modules.xml b/Source/.idea/modules.xml
deleted file mode 100644
index 6044bc3..0000000
--- a/Source/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="ProjectModuleManager">
- <modules>
- <module fileurl="file://$PROJECT_DIR$/.idea/Source.iml" filepath="$PROJECT_DIR$/.idea/Source.iml" />
- </modules>
- </component>
-</project>
\ No newline at end of file
diff --git a/Source/.idea/vcs.xml b/Source/.idea/vcs.xml
deleted file mode 100644
index 6c0b863..0000000
--- a/Source/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="VcsDirectoryMappings">
- <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
- </component>
-</project>
\ No newline at end of file
diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/ClassifyAuthController.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/ClassifyAuthController.java
index 8113955..5efa76f 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/ClassifyAuthController.java
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/ClassifyAuthController.java
@@ -1,6 +1,7 @@
package com.vci.ubcs.system.controller;
import com.vci.ubcs.system.entity.ClassifyAuth;
+import com.vci.ubcs.system.entity.Menu;
import com.vci.ubcs.system.service.IClassifyAuthService;
import com.vci.ubcs.system.vo.ClassifyAuthVO;
import io.swagger.annotations.Api;
@@ -11,6 +12,7 @@
import springfox.documentation.annotations.ApiIgnore;
import java.util.List;
+import java.util.Map;
/**
* 鍒嗙被鎺堟潈
@@ -47,4 +49,14 @@
return R.data(classifyAuthService.getClassifyAuthList(classifyAuthVO));
}
+ /**
+ * 鏌ヨ璇ュ垎绫讳笅锛屽綋鍓嶇櫥褰曠殑瑙掕壊鏈夊摢浜涙寜閽潈闄�
+ * @param classifyId
+ * @return
+ */
+ @GetMapping("getAuthButtonList")
+ public R<Map<String,Boolean>> getAuthButtonList(String classifyId){
+ return R.data(classifyAuthService.getAuthButtonList(classifyId));
+ }
+
}
diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/IClassifyAuthService.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/IClassifyAuthService.java
index 50dda61..71805b1 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/IClassifyAuthService.java
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/IClassifyAuthService.java
@@ -2,10 +2,12 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.vci.ubcs.system.entity.ClassifyAuth;
+import com.vci.ubcs.system.entity.Menu;
import com.vci.ubcs.system.vo.ClassifyAuthVO;
import org.springblade.core.tool.api.R;
import java.util.List;
+import java.util.Map;
/**
* 鍒嗙被鎺堟潈
@@ -28,5 +30,11 @@
*/
List<ClassifyAuthVO> getClassifyAuthList(ClassifyAuthVO classifyAuthVO);
+ /**
+ * 鏌ヨ璇ュ垎绫讳笅锛屽綋鍓嶇櫥褰曠殑瑙掕壊鏈夊摢浜涙寜閽潈闄�
+ * @param classifyId
+ * @return
+ */
+ Map<String,Boolean> getAuthButtonList(String classifyId);
}
diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/IMenuService.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/IMenuService.java
index e0d7964..c49017d 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/IMenuService.java
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/IMenuService.java
@@ -211,4 +211,10 @@
*/
R cloneMenuButton(Long menuId, List<String> buttonIds);
+ /**
+ * 鏍规嵁涓婚敭鑾峰彇鑿滃崟淇℃伅
+ * @param ids
+ * @return
+ */
+ List<Menu> getMenuListById(List<String> ids,String parentId);
}
diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/ClassifyAuthServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/ClassifyAuthServiceImpl.java
index e0eb813..0eb2627 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/ClassifyAuthServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/ClassifyAuthServiceImpl.java
@@ -1,28 +1,27 @@
package com.vci.ubcs.system.service.impl;
-import cn.hutool.db.ds.pooled.ConnectionWraper;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.vci.ubcs.starter.web.util.VciBaseUtil;
import com.vci.ubcs.system.entity.ClassifyAuth;
+import com.vci.ubcs.system.entity.Menu;
import com.vci.ubcs.system.mapper.ClassifyAuthMapper;
import com.vci.ubcs.system.service.IClassifyAuthService;
+import com.vci.ubcs.system.service.IMenuService;
import com.vci.ubcs.system.vo.ClassifyAuthVO;
+import com.vci.ubcs.system.vo.MenuVO;
import com.vci.ubcs.system.wrapper.ClassifyAuthWrapper;
import lombok.AllArgsConstructor;
-import lombok.RequiredArgsConstructor;
-import org.redisson.api.condition.Conditions;
import org.springblade.core.log.exception.ServiceException;
-import org.springblade.core.mp.support.Condition;
+import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -35,6 +34,8 @@
public class ClassifyAuthServiceImpl extends ServiceImpl<ClassifyAuthMapper,ClassifyAuth> implements IClassifyAuthService {
private final ClassifyAuthMapper classifyAuthMapper;
+
+ private final IMenuService menuService;
/**
* 鍒嗙被鎺堟潈淇濆瓨鎺ュ彛
@@ -80,4 +81,39 @@
return new ArrayList<ClassifyAuthVO>();
}
+ /**
+ * 鏌ヨ璇ュ垎绫讳笅锛屽綋鍓嶇櫥褰曠殑瑙掕壊鏈夊摢浜涙寜閽潈闄�
+ * @param classifyId
+ * @return
+ */
+ public Map<String,Boolean> getAuthButtonList(String classifyId){
+ final String roleIds = AuthUtil.getUser().getRoleId();
+ // 鍏堟煡璇㈡寜閽甶d鍒楄〃
+ LambdaQueryWrapper<ClassifyAuth> wrapper = Wrappers.<ClassifyAuth>query()
+ .lambda().eq(ClassifyAuth::getClassifyId, classifyId)
+ .in(ClassifyAuth::getRoleId, roleIds);
+ List<ClassifyAuth> classifyAuths = this.classifyAuthMapper.selectList(wrapper);
+ if(classifyAuths.size()>1){
+ throw new ServiceException("瑙掕壊鍜屽垎绫婚厤缃瓨鍦ㄥ鏉¤褰曪紝璇疯仈绯荤鐞嗕汉鍛樻竻鐞嗛敊璇厤缃紒");
+ }
+ // 鏄惁涓鸿秴绠�
+ Boolean isAdmin = VciBaseUtil.checkAdminTenant();
+ // 鏈厤缃寜閽潈闄�
+ if(!isAdmin && (classifyAuths.isEmpty() || Func.isBlank(classifyAuths.get(0).getButtonIds()))){
+ return new HashMap<>();
+ }
+ List<String> condition1 = new ArrayList<>();
+ // 濡傛灉涓嶆槸瓒呯鐢ㄦ埛
+ if(!isAdmin){
+ condition1.addAll(Arrays.asList(classifyAuths.get(0).getButtonIds().split(",")));
+ }
+ List<Menu> menuList = menuService.getMenuListById(condition1,"1648879284590858241");
+ if(menuList.isEmpty()){
+ return new HashMap<>();
+ }
+ Map<String, Boolean> buttonMaps = menuList.stream()
+ .collect(Collectors.toMap(Menu::getCode, menu -> true));
+ return buttonMaps;
+ }
+
}
diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MenuServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MenuServiceImpl.java
index f5682d4..50fdfa6 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MenuServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MenuServiceImpl.java
@@ -103,7 +103,7 @@
roleMenus = allMenus;
}
// 闈炶秴绾х鐞嗗憳骞朵笖涓嶆槸椤堕儴鑿滃崟璇锋眰鍒欒繑鍥炲搴旇鑹叉潈闄愯彍鍗�
- else if (!AuthUtil.isAdministrator() && Func.isEmpty(topMenuId)) {
+ else if (!VciBaseUtil.checkAdminTenant() && Func.isEmpty(topMenuId)) {
roleMenus = tenantPackageMenu(baseMapper.roleMenuByRoleId(Func.toLongList(roleId)));
}
// 椤堕儴鑿滃崟璇锋眰杩斿洖瀵瑰簲瑙掕壊鏉冮檺鑿滃崟
@@ -353,7 +353,7 @@
LambdaQueryWrapper<Menu> wrapper = Wrappers.<Menu>query()
.lambda()
.in(Menu::getCode, codes)
- .eq(Menu::getIsDeleted,0) /*鏈鍒犻櫎*/
+ .eq(Menu::getIsDeleted,BladeConstant.DB_NOT_DELETED) /*鏈鍒犻櫎*/
.eq(Menu::getCategory,1) /*鑿滃崟绫诲瀷涓嶈兘涓烘寜閽�*/
.orderByAsc(Menu::getCode); /*鏍规嵁code鎺掑簭涓巆lassify鐨刡tmtypeid瀵瑰簲*/
// 瓒呯涓嶇敤鏍规嵁瑙掕壊鏉ユ煡璇�
@@ -441,4 +441,23 @@
return this.saveBatch(newButtons) ? R.success("鎸夐挳鍏嬮殕鎴愬姛锛�"):R.fail("鎸夐挳鍏嬮殕澶辫触锛�");
}
+ /**
+ * 鏍规嵁涓婚敭鑾峰彇鑿滃崟淇℃伅
+ * @param ids
+ * @return
+ */
+ @Override
+ public List<Menu> getMenuListById(List<String> ids,String parentId) {
+ LambdaQueryWrapper<Menu> wrapper = Wrappers.<Menu>query()
+ .lambda().eq(Menu::getCategory, "2")
+ .eq(Menu::getIsDeleted,BladeConstant.DB_NOT_DELETED);
+ if(VciBaseUtil.checkAdminTenant()){
+ wrapper.eq(Menu::getParentId,parentId);
+ }else {
+ wrapper.in(Menu::getId, ids);
+ }
+ List<Menu> menuList = this.list(wrapper);
+ return menuList;
+ }
+
}
diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/MenuMapper.xml b/Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/MenuMapper.xml
index a1bb3af..df3421c 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/MenuMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/MenuMapper.xml
@@ -242,6 +242,7 @@
PL_SYS_MENU
WHERE
CODE = #{code})
+ ORDER BY SORT
</select>
<select id="grantTree" resultMap="treeNodeResultMap">
diff --git a/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java
index b1de27c..53de504 100644
--- a/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java
@@ -389,8 +389,8 @@
throw new ServiceException("瀵嗙爜涓繀椤诲惈鏈夈��"+strategy.getCombinationNames()+"銆戜腑鐨勩��"+strategy.getRequiredType()+"銆戠瀵嗙爜缁勫悎鏂瑰紡锛屼笖瀵嗙爜闀垮害蹇呴』鍦ㄣ��"+strategy.getMinPwdLen()+"-"+strategy.getMaxPwdLen()+"銆戣寖鍥村唴");
}
- oldPassword = DigestUtil.hex(DigestUtils.md5DigestAsHex((oldPassword).getBytes()));
- if (!user.getPassword().equals(oldPassword)) {
+ String hexOldPassword = DigestUtil.hex(oldPassword);
+ if (!user.getPassword().equals(hexOldPassword)) {
throw new ServiceException("鍘熷瘑鐮佷笉姝ｇ‘!");
}
List<String> regexs = sysClient.getRegexByList(Arrays.asList(strategy.getCombinationIds().split(","))).getData();
--
Gitblit v1.9.3