From 6778ebf0295313ce2b56bba000cef96e18afedd4 Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期五, 28 六月 2024 08:10:11 +0800
Subject: [PATCH] 角色、权限
---
HTML/views/ASNSetting/BoxInfo.html | 2
Wms/WMS.IBLL/ISysServer/IRoleRightServer.cs | 25 -
HTML/views/WareHouseSetting/Warehouse.html | 2
Wms/WMS.BLL/SysServer/RolesServer.cs | 97 +++--
HTML/views/ASNSetting/ArrivalLogTask.html | 2
Wms/WMS.BLL/SysServer/UserInforServer.cs | 31 -
HTML/views/QualityControl/QualityChangeLog.html | 2
HTML/views/BaseSetting/Packag.html | 4
HTML/views/Archiving/StockCheck.html | 2
HTML/views/ASNSetting/ArrivalNotice.html | 2
HTML/views/SOSetting/ExportNotice.html | 2
HTML/views/WareHouseSetting/Area.html | 2
Wms/Wms/Controllers/BasisController.cs | 332 +++-----------------
HTML/views/BaseSetting/Unit.html | 4
HTML/views/SystemSettings/UserForm.html | 2
HTML/views/BaseSetting/Customer.html | 2
HTML/views/ASNSetting/ProcurePlanNotice.html | 2
HTML/views/BaseSetting/Materials.html | 2
HTML/views/SystemSettings/Role.html | 16
HTML/views/SystemSettings/RoleForm.html | 2
HTML/views/WareHouseSetting/Exception.html | 2
HTML/views/QualityControl/InspectionRequest.html | 2
HTML/views/HouseWithinSetting/TaskSync.html | 2
Wms/Wms/Controllers/WeatherForecastController.cs | 78 ++--
HTML/views/BaseSetting/Department.html | 2
HTML/views/SOSetting/ExportAllot.html | 2
HTML/views/ASNSetting/PalletBind.html | 2
HTML/views/SystemSettings/Interface.html | 2
Wms/WMS.BLL/SysServer/RBACServer.cs | 96 ++---
HTML/views/SystemSettings/Dictionary.html | 2
Wms/WMS.BLL/SysServer/RoleRightServer.cs | 149 +++------
HTML/views/SystemSettings/Category.html | 2
HTML/views/WareHouseSetting/Pallets.html | 4
HTML/views/QualityControl/QualityInspection.html | 2
HTML/views/SystemSettings/Menumanagement.html | 2
HTML/views/ASNSetting/AuditLog.html | 2
HTML/views/HouseWithinSetting/StockCheck.html | 2
Wms/WMS.IBLL/ISysServer/IRBACServer.cs | 6
Wms/WMS.IBLL/ISysServer/IRolesServer.cs | 6
HTML/views/SystemSettings/FunSetting.html | 2
HTML/views/SOSetting/WaveMage.html | 2
HTML/views/ASNSetting/ArrivalReturnsNotice.html | 2
HTML/views/ASNSetting/LabelBox.html | 2
HTML/views/WareHouseSetting/Locate.html | 2
HTML/views/WareHouseSetting/Roadway.html | 2
HTML/views/SystemSettings/UserManage.html | 4
HTML/views/index.html | 2
HTML/views/QualityControl/QualityInformation.html | 2
HTML/views/SystemSettings/RoleRight.html | 2
HTML/views/SOSetting/PalletNoOut.html | 2
Wms/WMS.IBLL/ISysServer/IUserInforServer.cs | 4
HTML/views/BaseSetting/LogisticsInfo.html | 2
HTML/views/SOSetting/ExportLogTask.html | 2
53 files changed, 316 insertions(+), 616 deletions(-)
diff --git a/HTML/views/ASNSetting/ArrivalLogTask.html b/HTML/views/ASNSetting/ArrivalLogTask.html
index 4584c60..881a045 100644
--- a/HTML/views/ASNSetting/ArrivalLogTask.html
+++ b/HTML/views/ASNSetting/ArrivalLogTask.html
@@ -619,7 +619,7 @@
}
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "鍏ュ簱浠诲姟鍙栨秷") {
$(function () {
diff --git a/HTML/views/ASNSetting/ArrivalNotice.html b/HTML/views/ASNSetting/ArrivalNotice.html
index edec824..276c10c 100644
--- a/HTML/views/ASNSetting/ArrivalNotice.html
+++ b/HTML/views/ASNSetting/ArrivalNotice.html
@@ -626,7 +626,7 @@
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "娣诲姞鍏ュ簱鍗�") {
$(function() {
diff --git a/HTML/views/ASNSetting/ArrivalReturnsNotice.html b/HTML/views/ASNSetting/ArrivalReturnsNotice.html
index 700f92d..5a18178 100644
--- a/HTML/views/ASNSetting/ArrivalReturnsNotice.html
+++ b/HTML/views/ASNSetting/ArrivalReturnsNotice.html
@@ -878,7 +878,7 @@
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "娣诲姞鍏ュ簱鍗�") {
$(function() {
diff --git a/HTML/views/ASNSetting/AuditLog.html b/HTML/views/ASNSetting/AuditLog.html
index 0281ffb..353884e 100644
--- a/HTML/views/ASNSetting/AuditLog.html
+++ b/HTML/views/ASNSetting/AuditLog.html
@@ -404,7 +404,7 @@
$(".editClass").hide();
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "缂栬緫瀹℃牳璁板綍") {
$(function() {
diff --git a/HTML/views/ASNSetting/BoxInfo.html b/HTML/views/ASNSetting/BoxInfo.html
index b930e6b..a000e8d 100644
--- a/HTML/views/ASNSetting/BoxInfo.html
+++ b/HTML/views/ASNSetting/BoxInfo.html
@@ -619,7 +619,7 @@
$(".delClass").hide();
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "娣诲姞绠辨敮褰曞叆") {
$(function () {
diff --git a/HTML/views/ASNSetting/LabelBox.html b/HTML/views/ASNSetting/LabelBox.html
index a153e21..2b6c445 100644
--- a/HTML/views/ASNSetting/LabelBox.html
+++ b/HTML/views/ASNSetting/LabelBox.html
@@ -525,7 +525,7 @@
$(".delLabelClass").hide();
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "琛ユ墦鏍囩") {
$(function () {
diff --git a/HTML/views/ASNSetting/PalletBind.html b/HTML/views/ASNSetting/PalletBind.html
index 8a091f9..e2f1f25 100644
--- a/HTML/views/ASNSetting/PalletBind.html
+++ b/HTML/views/ASNSetting/PalletBind.html
@@ -849,7 +849,7 @@
$(".chexiaoClass").hide();
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "娣诲姞鎵樼洏缁戝畾") {
$(function () {
diff --git a/HTML/views/ASNSetting/ProcurePlanNotice.html b/HTML/views/ASNSetting/ProcurePlanNotice.html
index 42766ba..89c0a9f 100644
--- a/HTML/views/ASNSetting/ProcurePlanNotice.html
+++ b/HTML/views/ASNSetting/ProcurePlanNotice.html
@@ -426,7 +426,7 @@
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "鐢熸垚鍏ュ簱鍗�") {
$(function() {
diff --git a/HTML/views/Archiving/StockCheck.html b/HTML/views/Archiving/StockCheck.html
index eba152a..4425acc 100644
--- a/HTML/views/Archiving/StockCheck.html
+++ b/HTML/views/Archiving/StockCheck.html
@@ -564,7 +564,7 @@
$(".editDemoClass").hide();//澶囨敞
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "娣诲姞鐩樼偣鍗�") {
$(function() {
diff --git a/HTML/views/BaseSetting/Customer.html b/HTML/views/BaseSetting/Customer.html
index d8898f6..2adf509 100644
--- a/HTML/views/BaseSetting/Customer.html
+++ b/HTML/views/BaseSetting/Customer.html
@@ -150,7 +150,7 @@
$(".addClass").hide();
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "缂栬緫瀹㈡埛") {
$(".editClass").show();
diff --git a/HTML/views/BaseSetting/Department.html b/HTML/views/BaseSetting/Department.html
index 4c506bc..f451c9b 100644
--- a/HTML/views/BaseSetting/Department.html
+++ b/HTML/views/BaseSetting/Department.html
@@ -133,7 +133,7 @@
$(function() {
$(".approvalBtnupt").hide();
});
- if (res.code == 0) //鎴愬姛
+ if (res.code == 200) //鎴愬姛
{
for (var k = 0; k < res.data.length; k++)
{
diff --git a/HTML/views/BaseSetting/LogisticsInfo.html b/HTML/views/BaseSetting/LogisticsInfo.html
index 2ab13d6..7d7d190 100644
--- a/HTML/views/BaseSetting/LogisticsInfo.html
+++ b/HTML/views/BaseSetting/LogisticsInfo.html
@@ -261,7 +261,7 @@
$(".addClass").hide();
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "缂栬緫鐗╂祦") {
$(".editClass").show();
diff --git a/HTML/views/BaseSetting/Materials.html b/HTML/views/BaseSetting/Materials.html
index a28aba1..dfbbea7 100644
--- a/HTML/views/BaseSetting/Materials.html
+++ b/HTML/views/BaseSetting/Materials.html
@@ -275,7 +275,7 @@
$(function() {
$(".approvalBtnupt").hide();
});
- if (res.code == 0) //鎴愬姛
+ if (res.code == 200) //鎴愬姛
{
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "娣诲姞鐗╂枡")
diff --git a/HTML/views/BaseSetting/Packag.html b/HTML/views/BaseSetting/Packag.html
index 78d842e..de43d13 100644
--- a/HTML/views/BaseSetting/Packag.html
+++ b/HTML/views/BaseSetting/Packag.html
@@ -149,7 +149,7 @@
$(".delClass").hide();
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "缂栬緫鍖呰") {
$(function() {
@@ -282,7 +282,7 @@
$(".delClass").hide();
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "娣诲姞鍖呰")
{
diff --git a/HTML/views/BaseSetting/Unit.html b/HTML/views/BaseSetting/Unit.html
index 20596e0..af698ff 100644
--- a/HTML/views/BaseSetting/Unit.html
+++ b/HTML/views/BaseSetting/Unit.html
@@ -125,7 +125,7 @@
$(".delClass").hide();
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "缂栬緫鍗曚綅") {
@@ -358,7 +358,7 @@
$(".delClass").hide();
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "娣诲姞鍗曚綅") {
$(function () {
diff --git a/HTML/views/HouseWithinSetting/StockCheck.html b/HTML/views/HouseWithinSetting/StockCheck.html
index b1219ad..0cc78e5 100644
--- a/HTML/views/HouseWithinSetting/StockCheck.html
+++ b/HTML/views/HouseWithinSetting/StockCheck.html
@@ -603,7 +603,7 @@
$(".editDemoClass").hide();//澶囨敞
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "娣诲姞鐩樼偣鍗�") {
$(function() {
diff --git a/HTML/views/HouseWithinSetting/TaskSync.html b/HTML/views/HouseWithinSetting/TaskSync.html
index 6d7cec5..a099384 100644
--- a/HTML/views/HouseWithinSetting/TaskSync.html
+++ b/HTML/views/HouseWithinSetting/TaskSync.html
@@ -411,7 +411,7 @@
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "澶勭悊鍚屾浠诲姟") {
$(function() {
diff --git a/HTML/views/QualityControl/InspectionRequest.html b/HTML/views/QualityControl/InspectionRequest.html
index 315ac19..6922277 100644
--- a/HTML/views/QualityControl/InspectionRequest.html
+++ b/HTML/views/QualityControl/InspectionRequest.html
@@ -458,7 +458,7 @@
$(".clossClass").hide();
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "璇烽獙") {
$(function () {
diff --git a/HTML/views/QualityControl/QualityChangeLog.html b/HTML/views/QualityControl/QualityChangeLog.html
index c48fff2..3982921 100644
--- a/HTML/views/QualityControl/QualityChangeLog.html
+++ b/HTML/views/QualityControl/QualityChangeLog.html
@@ -259,7 +259,7 @@
$("#approvalBtn").hide();
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "娣诲姞璐ㄦ缁撴灉")
{
diff --git a/HTML/views/QualityControl/QualityInformation.html b/HTML/views/QualityControl/QualityInformation.html
index 6536610..0b7afab 100644
--- a/HTML/views/QualityControl/QualityInformation.html
+++ b/HTML/views/QualityControl/QualityInformation.html
@@ -294,7 +294,7 @@
$("#approvalBtn").hide();
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "娣诲姞璐ㄦ缁撴灉")
{
diff --git a/HTML/views/QualityControl/QualityInspection.html b/HTML/views/QualityControl/QualityInspection.html
index efb7087..fd71631 100644
--- a/HTML/views/QualityControl/QualityInspection.html
+++ b/HTML/views/QualityControl/QualityInspection.html
@@ -215,7 +215,7 @@
$(function() {
$("#approvalBtn").hide();
});
- if (res.code == 0) //鎴愬姛
+ if (res.code == 200) //鎴愬姛
{
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "娣诲姞璐ㄦ缁撴灉")
diff --git a/HTML/views/SOSetting/ExportAllot.html b/HTML/views/SOSetting/ExportAllot.html
index 24dfb71..121fede 100644
--- a/HTML/views/SOSetting/ExportAllot.html
+++ b/HTML/views/SOSetting/ExportAllot.html
@@ -789,7 +789,7 @@
$(".chexiaoClass").hide(); //鎾ら攢
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].ParentNo == "2400") {
if (res.data[k].MenuName == "鎾ら攢") {
diff --git a/HTML/views/SOSetting/ExportLogTask.html b/HTML/views/SOSetting/ExportLogTask.html
index eb5a6b1..6d25769 100644
--- a/HTML/views/SOSetting/ExportLogTask.html
+++ b/HTML/views/SOSetting/ExportLogTask.html
@@ -518,7 +518,7 @@
$(".outClass").hide(); //瀹屾垚
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if(res.data[k].ParentNo == "2600")
{
diff --git a/HTML/views/SOSetting/ExportNotice.html b/HTML/views/SOSetting/ExportNotice.html
index b01f45e..3f9836c 100644
--- a/HTML/views/SOSetting/ExportNotice.html
+++ b/HTML/views/SOSetting/ExportNotice.html
@@ -1033,7 +1033,7 @@
$(".editDemoClass").hide();//澶囨敞
$(".checkClass").hide(); //澶嶆牳
});
- sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
+ sendData(IP + "/Basis/", {}, 'get', function (res) {
if (res.code == 0) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].ParentNo == "2100") {
diff --git a/HTML/views/SOSetting/PalletNoOut.html b/HTML/views/SOSetting/PalletNoOut.html
index c24ce63..9d7cc6a 100644
--- a/HTML/views/SOSetting/PalletNoOut.html
+++ b/HTML/views/SOSetting/PalletNoOut.html
@@ -376,7 +376,7 @@
$(".outClass").hide(); //鍑哄簱
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if(res.data[k].ParentNo == "2800")
{
diff --git a/HTML/views/SOSetting/WaveMage.html b/HTML/views/SOSetting/WaveMage.html
index 8ca00c6..463f526 100644
--- a/HTML/views/SOSetting/WaveMage.html
+++ b/HTML/views/SOSetting/WaveMage.html
@@ -579,7 +579,7 @@
$(".delWaveClass").hide();
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "娣诲姞娉㈡") {
$(function () {
diff --git a/HTML/views/SystemSettings/Category.html b/HTML/views/SystemSettings/Category.html
index 5aefbcb..f692ada 100644
--- a/HTML/views/SystemSettings/Category.html
+++ b/HTML/views/SystemSettings/Category.html
@@ -136,7 +136,7 @@
$(function() {
$(".approvalBtndel").hide();
});
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "鏂板绫诲埆") {
$(function() {
diff --git a/HTML/views/SystemSettings/Dictionary.html b/HTML/views/SystemSettings/Dictionary.html
index af6d469..70997fb 100644
--- a/HTML/views/SystemSettings/Dictionary.html
+++ b/HTML/views/SystemSettings/Dictionary.html
@@ -217,7 +217,7 @@
$(function() {
$(".approvalBtndel").hide();
});
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "娣诲姞瀛楀吀") {
$(function() {
diff --git a/HTML/views/SystemSettings/FunSetting.html b/HTML/views/SystemSettings/FunSetting.html
index c264676..b826016 100644
--- a/HTML/views/SystemSettings/FunSetting.html
+++ b/HTML/views/SystemSettings/FunSetting.html
@@ -125,7 +125,7 @@
$(".approvalBtndel").hide();
});
console.log(res)
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "娣诲姞璁惧畾") {
$(function() {
diff --git a/HTML/views/SystemSettings/Interface.html b/HTML/views/SystemSettings/Interface.html
index 216ca22..9a30161 100644
--- a/HTML/views/SystemSettings/Interface.html
+++ b/HTML/views/SystemSettings/Interface.html
@@ -525,7 +525,7 @@
$(".delClass").hide();
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "娣诲姞鎺ュ彛") {
$(function() {
diff --git a/HTML/views/SystemSettings/Menumanagement.html b/HTML/views/SystemSettings/Menumanagement.html
index d44ce46..d1f38e3 100644
--- a/HTML/views/SystemSettings/Menumanagement.html
+++ b/HTML/views/SystemSettings/Menumanagement.html
@@ -203,7 +203,7 @@
$(".approvalBtnupt").hide();
$(".approvalBtndel").hide();
});
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
var list = res.data.filter(item => item.Layer == 0);
if (list) {
for (var i = 0; i < list.length; i++) {
diff --git a/HTML/views/SystemSettings/Role.html b/HTML/views/SystemSettings/Role.html
index ff3dd2b..021b914 100644
--- a/HTML/views/SystemSettings/Role.html
+++ b/HTML/views/SystemSettings/Role.html
@@ -96,8 +96,8 @@
RoleNo: RoleNo,
RoleName: RoleName,
};
- sendData(IP + "/Basis/GetRolesList?RoleNo=" + RoleNo + "&&RoleName=" + RoleName, {}, "get", function (res) {
- if (res.code == 0)
+ sendData(IP + "/Basis/GetRolesList?RoleNo=" + RoleNo + "&RoleName=" + RoleName, {}, "get", function (res) {
+ if (res.code == 200)
{
//鎴愬姛
var list = res.data;
@@ -136,7 +136,7 @@
$(function() {
$(".approvalBtndel").hide();
});
- if (res.code == 0)
+ if (res.code == 200)
{
//鎴愬姛
for (var k = 0; k < res.data.length; k++)
@@ -232,7 +232,7 @@
sendData(IP + "/basis/GetRolesList", {}, "get", function (res) {
var html = "";
- if (res.code == 0)
+ if (res.code == 200)
{
//鎴愬姛
var list = res.data;
@@ -298,7 +298,7 @@
Demo: field.Demo, //澶囨敞
};
sendData( IP + "/basis/UpdateRolesInfo", param, "post", function (res) {
- if (res.code == 0)
+ if (res.code == 200)
{
//鎴愬姛
layer.msg(
@@ -365,7 +365,7 @@
Demo: field.Demo, //澶囨敞
};
sendData( IP + "/basis/UpdateRolesInfo", param, "post", function (res) {
- if (res.code == 0)
+ if (res.code == 200)
{
//鎴愬姛
layer.msg(
@@ -416,7 +416,7 @@
doing = false;
sendData( IP + "/Basis/DeleteRoleInfo?Roleids=" + data.Id + "", {}, "get", function (res) {
console.log(res);
- if (res.code == 0)
+ if (res.code == 200)
{
//鎴愬姛
layer.msg(
@@ -487,7 +487,7 @@
{
doing = false;
sendData( IP + "/basis/InsertRoleInfo", param, "post", function (res) {
- if (res.code == 0)
+ if (res.code == 200)
{
//鎴愬姛
layer.msg(
diff --git a/HTML/views/SystemSettings/RoleForm.html b/HTML/views/SystemSettings/RoleForm.html
index 7bcc62a..7e4c102 100644
--- a/HTML/views/SystemSettings/RoleForm.html
+++ b/HTML/views/SystemSettings/RoleForm.html
@@ -65,7 +65,7 @@
};
console.log(id)
sendData(IP + "/basis/GetRolesListById?Roleid="+id, {} , 'get', function(res) {
- if (res.code == 0) //鎴愬姛
+ if (res.code == 200) //鎴愬姛
{
console.log(res.data)
//椤甸潰璧嬪��
diff --git a/HTML/views/SystemSettings/RoleRight.html b/HTML/views/SystemSettings/RoleRight.html
index a8bc440..133e3af 100644
--- a/HTML/views/SystemSettings/RoleRight.html
+++ b/HTML/views/SystemSettings/RoleRight.html
@@ -462,7 +462,7 @@
}
}
synData(IP +"/basis/InsertRoleRight?MenuNo="+rightListStr+"&&Id="+ids+"",{},"post",function (res) {
- if (res.code == 0)
+ if (res.code == 200)
{
//鎴愬姛
layer.msg(res.msg,{
diff --git a/HTML/views/SystemSettings/UserForm.html b/HTML/views/SystemSettings/UserForm.html
index 4d4afe4..daffb9f 100644
--- a/HTML/views/SystemSettings/UserForm.html
+++ b/HTML/views/SystemSettings/UserForm.html
@@ -135,7 +135,7 @@
var istrue = "0";
//瑙掕壊
sendData(IP + "/basis/GetRolesList", {}, 'get', function(res) {
- if (res.code == 0) //鎴愬姛
+ if (res.code == 200) //鎴愬姛
{
console.log(res.data)
//瑙掕壊鎷兼帴HTML
diff --git a/HTML/views/SystemSettings/UserManage.html b/HTML/views/SystemSettings/UserManage.html
index 92084fb..352bef6 100644
--- a/HTML/views/SystemSettings/UserManage.html
+++ b/HTML/views/SystemSettings/UserManage.html
@@ -116,7 +116,7 @@
//鑾峰彇瑙掕壊淇℃伅
sendData(IP + "/basis/GetRolesList", {}, 'get', function(res) {
var html = '';
- if (res.code == 0) //鎴愬姛
+ if (res.code == 200) //鎴愬姛
{
var list = res.data;
for (var i = 0; i < list.length; i++) {
@@ -203,7 +203,7 @@
$(function() {
$(".approvalBtnupt").hide();
});
- if (res.code == 0) //鎴愬姛
+ if (res.code == 200) //鎴愬姛
{
var list = res.data.filter(item => item.Layer == 0);
if (list)
diff --git a/HTML/views/WareHouseSetting/Area.html b/HTML/views/WareHouseSetting/Area.html
index 385bc4e..2c0cb33 100644
--- a/HTML/views/WareHouseSetting/Area.html
+++ b/HTML/views/WareHouseSetting/Area.html
@@ -162,7 +162,7 @@
$("#approvalBtn").hide();
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "缂栬緫鍖哄煙") {
$(function() {
diff --git a/HTML/views/WareHouseSetting/Exception.html b/HTML/views/WareHouseSetting/Exception.html
index 3cad3ae..77f6250 100644
--- a/HTML/views/WareHouseSetting/Exception.html
+++ b/HTML/views/WareHouseSetting/Exception.html
@@ -157,7 +157,7 @@
$(".editClass").hide();
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "澶勭悊寮傚父") {
$(function() {
diff --git a/HTML/views/WareHouseSetting/Locate.html b/HTML/views/WareHouseSetting/Locate.html
index 9f52be6..8b52d11 100644
--- a/HTML/views/WareHouseSetting/Locate.html
+++ b/HTML/views/WareHouseSetting/Locate.html
@@ -292,7 +292,7 @@
$(".editClass").hide();
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "缂栬緫鍌ㄤ綅") {
$(function() {
diff --git a/HTML/views/WareHouseSetting/Pallets.html b/HTML/views/WareHouseSetting/Pallets.html
index a7a3e9b..7e58133 100644
--- a/HTML/views/WareHouseSetting/Pallets.html
+++ b/HTML/views/WareHouseSetting/Pallets.html
@@ -111,7 +111,7 @@
$(".add").hide();
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "娣诲姞鏉＄爜") {
$(function() {
@@ -205,7 +205,7 @@
$(".addClass").hide();
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "娣诲姞鏉＄爜") {
$(function() {
diff --git a/HTML/views/WareHouseSetting/Roadway.html b/HTML/views/WareHouseSetting/Roadway.html
index 163c1ee..89fbef8 100644
--- a/HTML/views/WareHouseSetting/Roadway.html
+++ b/HTML/views/WareHouseSetting/Roadway.html
@@ -161,7 +161,7 @@
$(".onOffClass").hide();
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "缂栬緫宸烽亾") {
$(function() {
diff --git a/HTML/views/WareHouseSetting/Warehouse.html b/HTML/views/WareHouseSetting/Warehouse.html
index dcf8c9e..df6d072 100644
--- a/HTML/views/WareHouseSetting/Warehouse.html
+++ b/HTML/views/WareHouseSetting/Warehouse.html
@@ -106,7 +106,7 @@
$(".editClass").hide();
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "缂栬緫浠撳簱") {
$(function() {
diff --git a/HTML/views/index.html b/HTML/views/index.html
index 7536f0f..7b2aa69 100644
--- a/HTML/views/index.html
+++ b/HTML/views/index.html
@@ -167,7 +167,7 @@
}
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
- if (res.code == 0) { //鎴愬姛
+ if (res.code == 200) { //鎴愬姛
var list = res.data.filter(item => item.level == "0");
if (list) {
diff --git a/Wms/WMS.BLL/SysServer/RBACServer.cs b/Wms/WMS.BLL/SysServer/RBACServer.cs
index 5bb0c42..9b1ed93 100644
--- a/Wms/WMS.BLL/SysServer/RBACServer.cs
+++ b/Wms/WMS.BLL/SysServer/RBACServer.cs
@@ -12,6 +12,9 @@
using WMS.IDAL;
using WMS.IDAL.ISysInterface;
using Model.ModelVm.SysVm;
+using WMS.Entity.Context;
+using Utility;
+using Talk.Extensions;
namespace WMS.BLL.SysServer
{
@@ -26,17 +29,20 @@
public IRBACRepository _rbac { get; set; }
private readonly IMenuRepository _menu;
private readonly IRoleRightRepository _roleright;
+ private static readonly SqlSugarScope Db = DataContext.Db;
+ private readonly UserManager _userManager;
/// <summary>
/// 鏋勯�犲嚱鏁�
/// </summary>
/// <param name="rbac"></param>
/// <param name="menu"></param>
/// <param name="roleright"></param>
- public RBACServer(IRBACRepository rbac, IMenuRepository menu, IRoleRightRepository roleright)
+ public RBACServer(IRBACRepository rbac, IMenuRepository menu, IRoleRightRepository roleright, UserManager userManager)
{
_rbac = rbac;
_menu = menu;
_roleright = roleright;
+ _userManager = userManager;
}
/// <summary>
@@ -54,10 +60,14 @@
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
- public List<RoleRightDto> GetRoleRightList(int id)
+ public async Task<List<RoleRightDto>> GetRoleRightList(int id)
{
- List<RoleRightDto> roleRightDtos = _roleright.GetRoleRightListById(id);
- return roleRightDtos;
+ return await Db.Queryable<SysRoleRight>()
+ .LeftJoin<SysRoles>((a, b) => a.RoleNo == b.RoleNo)
+ .LeftJoin<SysFunctionMenu>((a, b, c) => a.MenuNo == c.MenuNo)
+ .Where((a, b, c) => a.Id == id && a.IsDel == "0")
+ .Select<RoleRightDto>()
+ .ToListAsync();
}
/// <summary>
@@ -65,53 +75,31 @@
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
- public object GetMenuByroleIdNew(int id)
+ public async Task<List<FunctionMenuDto>> GetMenuByroleIdNew(int id)
{
- try
+ List<RoleRightDto> rolerightlist = await Db.Queryable<SysRoleRight>().LeftJoin<SysRoles>((a, b) => a.RoleNo == b.RoleNo)
+ .LeftJoin<SysFunctionMenu>((a, b, c) => a.MenuNo == c.MenuNo)
+ .Where((a, b, c) => a.Id == id && a.IsDel == "0")
+ .Select<RoleRightDto>()
+ .ToListAsync();
+ var listMenuNo = rolerightlist.Select(s => s.MenuNo).Distinct().ToList();
+ List<FunctionMenuDto> listMenu = await Db.Queryable<SysFunctionMenu>().OrderBy(m => m.MenuNo).Select(m => new FunctionMenuDto()
{
- List<RoleRightDto> rolerightlist = _roleright.GetRoleRightListById(id);
- //var list = DataContext.WmsSysRight.Where(m => m.UserGroupId == id).ToList();
- var str = new List<string>();
- foreach (var item in rolerightlist)
- {
- str.Add(item.MenuNo);
- }
- string sql1 = $"select * from SysFunctionMenu where IsDel = '0' and ParentNo = ''";
- List<FunctionMenuDto> parent = _menu.GetMenuList(sql1).OrderBy(m => m.MenuNo).Select(m => new FunctionMenuDto()
- {
- //Id = m.Id,
- MenuNo = m.MenuNo,
- ParentId = m.ParentNo,
- title = m.MenuName,
- //expand = str.Contains(m.Id),
- @checked = str.Contains(m.MenuNo)
- }).ToList();
-
- string sql2 = $"select * from SysFunctionMenu where IsDel = '0' and ParentNo != ''";
- List<FunctionMenuDto> child = _menu.GetMenuList(sql2).OrderBy(m => m.MenuNo).Select(m => new FunctionMenuDto()
- {
- //Id = m.Id,
- MenuNo = m.MenuNo,
- ParentId = m.ParentNo,
- title = m.MenuName,
- Expand = str.Contains(m.MenuNo),
- @checked = str.Contains(m.MenuNo)
- }).ToList();
-
- List<FunctionMenuDto> data = new List<FunctionMenuDto>();
-
- foreach (var item in parent)
- {
- data.Add(item);
- FunNew(child, item);
- }
- return data;
-
- }
- catch (Exception ex)
+ //Id = m.Id,
+ MenuNo = m.MenuNo,
+ ParentId = m.ParentNo,
+ title = m.MenuName,
+ Expand = listMenuNo.Contains(m.MenuNo),
+ @checked = listMenuNo.Contains(m.MenuNo)
+ }).ToListAsync();
+ var listParent = listMenu.Where(s => s.ParentId == "").ToList();
+ var listChild = listMenu.Where(s => s.ParentId != "").ToList();
+ foreach (var item in listParent)
{
- throw new Exception("鑾峰彇瑙掕壊瀵瑰簲鐨勮彍鍗曚俊鎭�" + ex.Message);
+ FunNew(listChild, item);
}
+ return listParent;
+
}
public void FunNew(List<FunctionMenuDto> all, FunctionMenuDto curItem)
{
@@ -123,7 +111,6 @@
{
FunNew(all, subItem);
}
-
}
@@ -134,11 +121,16 @@
/// <param name="MenuNo"></param>
/// <param name="UserId"></param>
/// <returns></returns>
- public List<FunctionMenuDto> GetRoleRightRBAC(string MenuNo, string UserId)
+ public async Task<List<FunctionMenuDto>> GetRoleRightRBAC(string MenuNo, string UserId)
{
- List<FunctionMenuDto> menudto = _menu.GetMenuDtoList(MenuNo,UserId);
-
- return menudto;
+ var modUser = await Db.Queryable<SysUserInfor>().FirstAsync(s => s.Id == _userManager.UserId);
+ return await Db.Queryable<SysFunctionMenu>()
+ .Where(s => s.IsDel == "0")
+ .WhereIF(!string.IsNullOrEmpty(MenuNo), s => s.ParentNo == MenuNo)
+ .WhereIF(modUser.UserName.ToUpper() != "ADMIN", s => SqlFunc.Subqueryable<SysRoleRight>().Where(c => c.RoleNo == modUser.RoleNo && s.MenuNo == c.MenuNo).Any())
+ .OrderBy(s => s.Ord, OrderByType.Asc)
+ .Select<FunctionMenuDto>()
+ .ToListAsync();
}
}
}
diff --git a/Wms/WMS.BLL/SysServer/RoleRightServer.cs b/Wms/WMS.BLL/SysServer/RoleRightServer.cs
index 1f16667..63cc975 100644
--- a/Wms/WMS.BLL/SysServer/RoleRightServer.cs
+++ b/Wms/WMS.BLL/SysServer/RoleRightServer.cs
@@ -7,7 +7,10 @@
using AutoMapper;
using Model.ModelDto.SysDto;
using Model.ModelVm.SysVm;
+using SqlSugar;
+using Utility;
using WMS.DAL.SystemService;
+using WMS.Entity.Context;
using WMS.Entity.SysEntity;
using WMS.IBLL.ISysServer;
using WMS.IDAL.ISysInterface;
@@ -23,13 +26,16 @@
/// 渚濊禆娉ㄥ叆
/// </summary>
public IRoleRightRepository _rolerights { get; set; }
+ private static readonly SqlSugarScope Db = DataContext.Db;
+ private readonly UserManager _userManager;
/// <summary>
/// 鏋勯�犲嚱鏁�
/// </summary>
/// <param name="roles"></param>
- public RoleRightServer(IRoleRightRepository rolerights)
+ public RoleRightServer(IRoleRightRepository rolerights, UserManager userManager)
{
_rolerights = rolerights;
+ _userManager = userManager;
}
/// <summary>
@@ -37,28 +43,24 @@
/// </summary>
/// <param name="userId">鐢ㄦ埛Id</param>
/// <returns></returns>
- public List<RoleRightDto> GetRoleMenuList(int userId)
+ public async Task<List<RoleRightDto>> GetRoleMenuList()
{
- try
+ var modUser = await Db.Queryable<SysUserInfor>().FirstAsync(m => m.Id == _userManager.UserId && m.IsDel == "0");
+ if (modUser == null)
{
- var user = _rolerights.GetRoleMenuList(userId);
- return user;
+ throw Oops.Bah("鏈煡璇㈠埌鐧诲綍浜轰俊鎭�");
}
- catch (Exception e)
+ if (string.IsNullOrWhiteSpace(modUser.RoleNo))
{
- throw new Exception(e.Message);
+ throw Oops.Bah("鏈煡璇㈠埌鐧诲綍浜虹殑鎵�灞炶鑹蹭俊鎭�");
}
- }
-
- /// <summary>
- /// 鑾峰彇瑙掕壊鏉冮檺淇℃伅鍒楄〃
- /// 澶氳〃锛氳鑹叉潈闄愩�佽鑹层�佽彍鍗�
- /// </summary>
- /// <returns></returns>
- public List<RoleRightDto> GetRoleRightList()
- {
- List<RoleRightDto> roleRightDtos = _rolerights.GetRoleRightList();
- return roleRightDtos;
+ return await Db.Queryable<SysRoleRight>()
+ .LeftJoin<SysFunctionMenu>((a, b) => a.MenuNo == b.MenuNo)
+ .LeftJoin<SysRoles>((a, b, c) => a.RoleNo == c.RoleNo)
+ .Where((a, b, c) => a.IsDel == "0" && b.IsDel == "0" && c.IsDel == "0")
+ .Where((a, b, c) => a.RoleNo == modUser.RoleNo)
+ .Select<RoleRightDto>()
+ .ToListAsync();
}
/// <summary>
@@ -66,21 +68,9 @@
/// </summary>
/// <param name="rolerightids">瑙掕壊鏉冮檺id</param>
/// <returns></returns>
- public List<SysRoleRight> GetRoleRightOneListById(int id)
+ public async Task<List<SysRoleRight>> GetRoleRightOneListById(int id)
{
- List<SysRoleRight> roleRights = _rolerights.GetRoleRightOneListById(id);
- return roleRights;
- }
-
- /// <summary>
- /// 鏍规嵁瑙掕壊鍙疯幏鍙栬鑹叉潈闄愪俊鎭垪琛�(鍗曡〃)
- /// </summary>
- /// <param name="roleno">瑙掕壊濂�</param>
- /// <returns></returns>
- public List<SysRoleRight> GetRoleRightOneListByNo(string roleno)
- {
- List<SysRoleRight> roleRights = _rolerights.GetRoleRightOneListByNo(roleno);
- return roleRights;
+ return await Db.Queryable<SysRoleRight>().Where(s => s.IsDel == "0" && s.RoleNo == SqlFunc.Subqueryable<SysRoles>().Where(c => c.IsDel == "0" && c.Id == id).Select(c => c.RoleNo)).ToListAsync();
}
/// <summary>
@@ -90,79 +80,44 @@
/// <param name="RoleNo">瑙掕壊鍙�</param>
/// <returns></returns>
/// <exception cref="Exception">鎹曡幏寮傚父</exception>
- public async Task<int> InsertRoleRight(string MenuNo, string RoleNo, string userId)
+ public async Task InsertRoleRight(string MenuNo, string RoleNo)
{
- //鎹曡幏寮傚父
- try
+ List<SysRoleRight> listRole = await Db.Queryable<SysRoleRight>().Where(s => s.RoleNo == RoleNo).ToListAsync();
+ if (listRole.Count > 0)
{
- //灏嗚彍鍗曞彿杩涜鍒嗗壊 瀛樺偍鏁扮粍涓�
- var arr = MenuNo.Split(',');
- int i = 0;
- //鏌ヨ璇ヨ鑹叉槸鍚︽嫢鏈夋潈闄�
- List<SysRoleRight> rolelist = GetRoleRightOneListByNo(RoleNo);
- //鏈�
- if (rolelist.Count > 0)
+ await Db.Deleteable<SysRoleRight>().Where(s => s.RoleNo == RoleNo).ExecuteCommandAsync();
+ }
+ var arr = MenuNo.Split(',');
+ var listRight = new List<SysRoleRight>();
+ //寰幆灏嗚彍鍗曟暟缁勫垎鍒姞鍏ュ埌鏁版嵁妯″瀷涓�
+ for (int j = 0; j < arr.Count(); j++)
+ {
+ SysRoleRight roleright = new SysRoleRight();
+ roleright.RoleNo = RoleNo;//瑙掕壊鍙�
+ roleright.MenuNo = arr[j];//鑿滃崟鍙�
+ roleright.CreateUser = _userManager.UserId;//鍒涘缓浜�
+ roleright.CreateTime = DateTime.Now;
+ listRight.Add(roleright);
+ }
+ await Db.Insertable(listRight).ExecuteCommandAsync();
+
+ //鍒犻櫎瀛愮骇瑙掕壊鏉冮檺淇℃伅銆�(瑙掕壊鏉冮檺鍑忓皯锛岃鑹蹭笅绾ф潈闄愬悓鏃跺噺灏�)
+ List<SysRoles> listRoleDel = await Db.Queryable<SysRoles>().Where(s => SqlFunc.Subqueryable<SysUserInfor>().Where(c => c.RoleNo == RoleNo && s.Id == c.Id).Any()).ToListAsync();
+ var listRoleNo = listRoleDel.Select(s => s.RoleNo).Distinct().ToList();
+ List<SysRoleRight> listRoleRight = await Db.Queryable<SysRoleRight>().Where(s => listRoleNo.Contains(s.RoleNo)).ToListAsync();
+ foreach (var item in listRoleDel)
+ {
+ var listChildRoleRight = listRoleRight.Where(s => s.RoleNo == item.RoleNo).ToList();
+ foreach (var right in listChildRoleRight)
{
- //鍒犻櫎璇ヨ鑹叉墍鏈夎彍鍗曚俊鎭�
- i = await DeleteRoleRight(RoleNo);
- }
- //鏃�
- else if (rolelist.Count == 0)
- {
- i = 1;
- }
- //寮�濮嬫柊澧炴潈闄�
- if (i > 0)
- {
- SysRoleRight roleright = new SysRoleRight();
- //寰幆灏嗚彍鍗曟暟缁勫垎鍒姞鍏ュ埌鏁版嵁妯″瀷涓�
- for (int j = 0; j < arr.Count(); j++)
+ int first1 = Array.IndexOf(arr, right.MenuNo);
+ if (first1 <= -1)
{
- roleright.RoleNo = RoleNo;//瑙掕壊鍙�
- roleright.MenuNo = arr[j];//鑿滃崟鍙�
- roleright.CreateUser = Convert.ToInt32(userId);//鍒涘缓浜�
-
- //鎴愬姛 灏嗚彍鍗曞彿鍜岃鑹插彿鏂板涓烘柊鐨勬暟鎹�
- i = await _rolerights.InsertRoleRight(roleright);
+ await Db.Deleteable<SysRoleRight>().Where(s => s.RoleNo == item.RoleNo && s.MenuNo == right.MenuNo).ExecuteCommandAsync();
}
- //鍒犻櫎瀛愮骇瑙掕壊鏉冮檺淇℃伅銆�(瑙掕壊鏉冮檺鍑忓皯锛岃鑹蹭笅绾ф潈闄愬悓鏃跺噺灏�)
- await _rolerights.DeleteChildRoleRight(RoleNo, MenuNo);
- //杩斿洖
- return i;
-
}
- else
- {
- return i;
- }
- }
- catch (Exception ex)
- {
- //鎶涘嚭寮傚父
- throw new Exception("鏂板瑙掕壊鏉冮檺淇℃伅寮傚父", ex);
}
}
- /// <summary>
- /// 鍒犻櫎瑙掕壊鏉冮檺淇℃伅
- /// </summary>
- /// <param name="RoleNo">瑙掕壊鍙�</param>
- /// <returns></returns>
- /// <exception cref="Exception">鎹曡幏寮傚父</exception>
- public async Task<int> DeleteRoleRight(string RoleNo)
- {
- //鎹曡幏寮傚父
- try
- {
- //鍒犻櫎
- int i = await _rolerights.DeleteRoleRight(RoleNo);
- return i;
- }
- catch (Exception ex)
- {
- //鎶涘嚭寮傚父
- throw new Exception("鍒犻櫎瑙掕壊鏉冮檺淇℃伅寮傚父", ex);
- }
- }
}
}
\ No newline at end of file
diff --git a/Wms/WMS.BLL/SysServer/RolesServer.cs b/Wms/WMS.BLL/SysServer/RolesServer.cs
index 17568bd..6a767ad 100644
--- a/Wms/WMS.BLL/SysServer/RolesServer.cs
+++ b/Wms/WMS.BLL/SysServer/RolesServer.cs
@@ -1,10 +1,13 @@
锘縰sing AutoMapper;
using Model.ModelDto.SysDto;
+using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using Utility;
+using WMS.Entity.Context;
using WMS.Entity.SysEntity;
using WMS.IBLL.ISysServer;
using WMS.IDAL.ISysInterface;
@@ -19,17 +22,18 @@
/// <summary>
/// 渚濊禆娉ㄥ叆
/// </summary>
- public IRolesRepository _roles { get; set; }
private readonly IMapper _mapper;
+ private static readonly SqlSugarScope Db = DataContext.Db;
+ private readonly UserManager _userManager;
/// <summary>
/// 鏋勯�犲嚱鏁�
/// </summary>
/// <param name="roles">瑙掕壊</param>
/// <param name="mapper">automapper</param>
- public RolesServer(IRolesRepository roles,IMapper mapper)
+ public RolesServer(IMapper mapper, UserManager userManager)
{
- _roles = roles; //瑙掕壊
_mapper = mapper; //automapper
+ _userManager = userManager;
}
/// <summary>
@@ -38,12 +42,22 @@
/// <param name="RoleNo">瑙掕壊鍙�</param>
/// <param name="RoleName">瑙掕壊鍚嶇О</param>
/// <returns></returns>
- public List<RoleDto> GetRoleList(string RoleNo, string RoleName,string UserId)
+ public async Task<List<RoleDto>> GetRoleList(string RoleNo, string RoleName)
{
- //鑾峰彇瑙掕壊淇℃伅
- List<RoleDto> rolelist = _roles.GetRoleList(RoleNo, RoleName, UserId);
- //杩斿洖鏁版嵁
- return rolelist;
+ var modUser = await Db.Queryable<SysUserInfor>().FirstAsync(s => s.Id == _userManager.UserId);
+ return await Db.Queryable<SysRoles>()
+ .LeftJoin<SysUserInfor>((a, b) => a.CreateUser == b.Id)
+ .LeftJoin<SysUserInfor>((a, b, c) => a.UpdateUser == c.Id)
+ .WhereIF(modUser.UserName.ToUpper() != "ADMIN", a => a.CreateUser == _userManager.UserId)
+ .WhereIF(!string.IsNullOrEmpty(RoleNo), a => a.RoleNo.Contains(RoleNo))
+ .WhereIF(!string.IsNullOrEmpty(RoleName), a => a.RoleName.Contains(RoleName))
+ .Where(a => a.IsDel == "0")
+ .Select<RoleDto>((a, b, c) => new RoleDto()
+ {
+ CreateUserName = b.RealName,
+ UpdateUserName = c.RealName
+ }, true)
+ .ToListAsync();
}
/// <summary>
@@ -51,10 +65,9 @@
/// </summary>
/// <param name="RoleNo">瑙掕壊缂栧彿</param>
/// <returns></returns>
- public int GetRoleByNo(string RoleNo)
+ public async Task<int> GetRoleByNo(string RoleNo)
{
- List<SysRoles> role = _roles.GetRoleByNo(RoleNo);
- return role.Count;
+ return await Db.Queryable<SysRoles>().CountAsync(s => s.RoleNo == RoleNo && s.IsDel == "0");
}
/// <summary>
@@ -65,31 +78,21 @@
/// <exception cref="Exception">鎹曡幏寮傚父</exception>
public async Task<int> InsertRoleInfo(RoleDto roledto)
{
- //鎹曡幏寮傚父
- try
+ //妯″瀷鏄犲皠
+ SysRoles roles = _mapper.Map<SysRoles>(roledto);
+ //鍒ゆ柇瑙掕壊鍙锋槸鍚﹀敮涓�
+ int count = await GetRoleByNo(roledto.RoleNo);
+ if (count > 0)
{
- //妯″瀷鏄犲皠
- SysRoles roles = _mapper.Map<SysRoles>(roledto);
- //鍒ゆ柇瑙掕壊鍙锋槸鍚﹀敮涓�
- int count = GetRoleByNo(roledto.RoleNo);
- int i = 0;
- if (count > 0)
- {
- i = 3;
- }
- else if (count == 0)
- {
- //鏂板瑙掕壊淇℃伅
- i = await _roles.InsertRoleInfo(roles);
- }
-
- return i;
+ throw Oops.Bah("瑙掕壊鍙峰繀椤诲敮涓�");
}
- catch (Exception ex)
- {
- //鎶涘嚭寮傚父
- throw new Exception("瑙掕壊淇℃伅鏂板寮傚父", ex);
- }
+ //鏂板瑙掕壊淇℃伅
+ roles.CreateTime = DateTime.Now;
+ roles.CreateUser = _userManager.UserId;
+ var i = await Db.Insertable(roles).ExecuteCommandAsync();
+ if (i <= 0)
+ throw Oops.Bah("鏂板瑙掕壊鏁版嵁淇℃伅澶辫触");
+ return i;
}
@@ -100,8 +103,12 @@
/// <returns></returns>
public async Task<int> DeleteRoleInfo(SysRoles roles)
{
- int i = await _roles.DeleteRoleInfo(roles);
- return i;
+ return await Db.Updateable<SysRoles>()
+ .Where(s => s.Id == roles.Id)
+ .SetColumns(s => s.IsDel == "1")
+ .SetColumns(s => s.UpdateTime == DateTime.Now)
+ .SetColumns(s => s.UpdateUser == _userManager.UserId)
+ .ExecuteCommandAsync();
}
@@ -112,10 +119,17 @@
/// <returns></returns>
public async Task<int> UpdateRoleInfo(SysRoles role)
{
- //淇敼
- int i = await _roles.UpdateRoleInfo(role);
+ int count = await Db.Queryable<SysRoles>().CountAsync(s => s.RoleNo == role.RoleNo && s.Id != role.Id && s.IsDel == "0");
+ if (count > 0)
+ throw Oops.Bah("瑙掕壊鍙峰繀椤诲敮涓�");
+ role.UpdateTime = DateTime.Now;
+ role.UpdateUser = _userManager.UserId;
+ int i = await Db.Updateable(role)
+ .UpdateColumns(s => new { s.RoleNo, s.RoleName, s.Demo, s.UpdateUser, s.UpdateTime })
+ .ExecuteCommandAsync();
+ if (i <= 0)
+ throw Oops.Bah("淇敼瑙掕壊鏁版嵁淇℃伅澶辫触");
return i;
-
}
/// <summary>
@@ -123,10 +137,9 @@
/// </summary>
/// <param name="roleids">瑙掕壊id</param>
/// <returns></returns>
- public SysRoles GetRoleInfoById(int roleids)
+ public async Task<SysRoles> GetRoleInfoById(int roleids)
{
- SysRoles role= _roles.GetRoleInfoById(roleids);
- return role;
+ return await Db.Queryable<SysRoles>().FirstAsync(s => s.Id == roleids && s.IsDel == "0");
}
}
diff --git a/Wms/WMS.BLL/SysServer/UserInforServer.cs b/Wms/WMS.BLL/SysServer/UserInforServer.cs
index 6d6ecac..4597c85 100644
--- a/Wms/WMS.BLL/SysServer/UserInforServer.cs
+++ b/Wms/WMS.BLL/SysServer/UserInforServer.cs
@@ -21,14 +21,12 @@
{
public class UserInforServer : IUserInforServer
{
- public IUserInforRepository UserSvc { get; set; }
readonly IMapper _mapper;
private readonly IFunSettingServer _setting;
private static readonly SqlSugarScope Db = DataContext.Db;
private readonly UserManager _userManager;
- public UserInforServer(IUserInforRepository userSvc, IMapper mapper, IFunSettingServer setting, UserManager userManager)
+ public UserInforServer(IMapper mapper, IFunSettingServer setting, UserManager userManager)
{
- UserSvc = userSvc;
_mapper = mapper;
_setting = setting;
_userManager = userManager;
@@ -37,7 +35,7 @@
public async Task<int> LoginAdmin(string loginName, string loginPwd)
{
//loginPwd = Md5Tools.CalcMd5(loginPwd);
- var modUser = await Db.Queryable<SysUserInfor>().FirstAsync(m => m.UserName == loginName && m.PassWord == loginPwd);
+ var modUser = await Db.Queryable<SysUserInfor>().FirstAsync(m => m.UserName == loginName && m.PassWord == loginPwd &&m.IsDel=="0");
if (modUser != null) //璐﹀彿瀵嗙爜鏄惁姝ｇ‘
{
if (modUser.Status == "0") //褰撳墠璐﹀彿鏄惁姝ｅ父鍚敤
@@ -56,13 +54,6 @@
return -1;
}
}
- public SysUserInfor CeShi()
- {
- var date = UserSvc.ceshi();
-
- return date;
-
- }
/// <summary>
/// 鑾峰彇鐢ㄦ埛瑙掕壊淇℃伅
@@ -79,7 +70,13 @@
.WhereIF(!string.IsNullOrEmpty(RoleNo), a => a.RoleNo == RoleNo)
.WhereIF(!string.IsNullOrEmpty(Status), a => a.Status == Status)
.Where(a => a.IsDel == "0")
- .Select<UserInfoDto>()
+ .Select<UserInfoDto>((a, b, c, d) => new UserInfoDto()
+ {
+ RealName = a.RealName,
+ CreateUserName = b.RealName,
+ DepartmentName = c.DepartmentName,
+ RoleName = d.RoleName,
+ }, true)
.ToListAsync();
}
@@ -118,11 +115,10 @@
}
else if (count == 0)
{
- //鏂板鐢ㄦ埛
- //i = await UserSvc.InsertUserInfo(userinfo);
userinfo.PassWord = Md5Tools.CalcMd5("boxline");
userinfo.SetPasswordTime = DateTime.Now;
userinfo.CreateTime = DateTime.Now;
+ userinfo.CreateUser = _userManager.UserId;
i = await Db.Insertable(userinfo).ExecuteCommandAsync();
if (i <= 0)
throw Oops.Bah("鏂板鐢ㄦ埛淇℃伅澶辫触");
@@ -167,9 +163,10 @@
}
else if (count == 0)
{
+ userdto.UpdateUser = _userManager.UserId;
userdto.UpdateTime = DateTime.Now;
i = await Db.Updateable(userlist)
- .UpdateColumns(s => new { s.UserName, s.UserNo, s.Sex, s.RoleNo, s.RealName, s.Phone, s.Paper, s.Nationality, s.JobNo, s.Email, s.Demo, s.Addres })
+ .UpdateColumns(s => new { s.UserName, s.UserNo, s.Sex, s.RoleNo, s.RealName, s.Phone, s.Paper, s.Nationality, s.JobNo, s.Email, s.Demo, s.Addres, s.UpdateUser, s.UpdateTime })
.ExecuteCommandAsync();
if (i <= 0)
throw Oops.Bah("缂栬緫鐢ㄦ埛淇℃伅澶辫触");
@@ -182,9 +179,9 @@
/// </summary>
/// <param name="userids">鐢ㄦ埛id</param>
/// <returns></returns>
- public async Task<SysUserInfor> GetUserInfoById(int userids)
+ public async Task<SysUserInfor> GetUserInfoById(int userid)
{
- return await Db.Queryable<SysUserInfor>().FirstAsync(s => s.Id == userids && s.IsDel == "0");
+ return await Db.Queryable<SysUserInfor>().FirstAsync(s => s.Id == userid && s.IsDel == "0");
}
/// <summary>
diff --git a/Wms/WMS.IBLL/ISysServer/IRBACServer.cs b/Wms/WMS.IBLL/ISysServer/IRBACServer.cs
index 4824bb1..65faec6 100644
--- a/Wms/WMS.IBLL/ISysServer/IRBACServer.cs
+++ b/Wms/WMS.IBLL/ISysServer/IRBACServer.cs
@@ -24,20 +24,20 @@
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
- List<RoleRightDto> GetRoleRightList(int id);
+ Task<List<RoleRightDto>> GetRoleRightList(int id);
/// <summary>
/// 鏍规嵁瑙掕壊Id鑾峰彇瀵瑰簲鐨勮彍鍗曢�変腑
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
- object GetMenuByroleIdNew(int id);
+ Task<List<FunctionMenuDto>> GetMenuByroleIdNew(int id);
/// <summary>
/// 鍒嗛厤鏉冮檺鏄剧ず
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
- List<FunctionMenuDto> GetRoleRightRBAC(string MenuNo,string UserId);
+ Task<List<FunctionMenuDto>> GetRoleRightRBAC(string MenuNo,string UserId);
}
}
diff --git a/Wms/WMS.IBLL/ISysServer/IRoleRightServer.cs b/Wms/WMS.IBLL/ISysServer/IRoleRightServer.cs
index 89bf76f..aed0bea 100644
--- a/Wms/WMS.IBLL/ISysServer/IRoleRightServer.cs
+++ b/Wms/WMS.IBLL/ISysServer/IRoleRightServer.cs
@@ -17,27 +17,14 @@
/// </summary>
/// <param name="userId">鐢ㄦ埛Id</param>
/// <returns></returns>
- List<RoleRightDto> GetRoleMenuList(int userId);
- /// <summary>
- /// 鑾峰彇瑙掕壊鏉冮檺淇℃伅鍒楄〃
- /// 澶氳〃锛氳鑹叉潈闄愩�佽鑹层�佽彍鍗�
- /// </summary>
- /// <returns></returns>
- List<RoleRightDto> GetRoleRightList();
+ Task<List<RoleRightDto>> GetRoleMenuList();
/// <summary>
/// 鑾峰彇瑙掕壊鏉冮檺淇℃伅鍒楄〃(鍗曡〃)
/// </summary>
/// <param name="rolerightids">瑙掕壊鏉冮檺id</param>
/// <returns></returns>
- List<SysRoleRight> GetRoleRightOneListById(int id);
-
- /// <summary>
- /// 鏍规嵁瑙掕壊鍙疯幏鍙栬鑹叉潈闄愪俊鎭垪琛�(鍗曡〃)
- /// </summary>
- /// <param name="roleno">瑙掕壊鍙�</param>
- /// <returns></returns>
- List<SysRoleRight> GetRoleRightOneListByNo(string roleno);
+ Task<List<SysRoleRight>> GetRoleRightOneListById(int id);
/// <summary>
/// 鏂板瑙掕壊鏉冮檺淇℃伅
@@ -45,13 +32,7 @@
/// <param name="MenuNo">鑿滃崟鍙�</param>
/// <param name="RoleNo">瑙掕壊鍙�</param>
/// <returns></returns>
- Task<int> InsertRoleRight(string MenuNo, string RoleNo,string userId);
+ Task InsertRoleRight(string MenuNo, string RoleNo);
- /// <summary>
- /// 鍒犻櫎瑙掕壊鏉冮檺淇℃伅
- /// </summary>
- /// <param name="roleNo">瑙掕壊鍙�</param>
- /// <returns></returns>
- Task<int> DeleteRoleRight(string roleNo);
}
}
diff --git a/Wms/WMS.IBLL/ISysServer/IRolesServer.cs b/Wms/WMS.IBLL/ISysServer/IRolesServer.cs
index e93a568..807bddf 100644
--- a/Wms/WMS.IBLL/ISysServer/IRolesServer.cs
+++ b/Wms/WMS.IBLL/ISysServer/IRolesServer.cs
@@ -18,14 +18,14 @@
/// <param name="RoleNo">瑙掕壊鍙�</param>
/// <param name="RoleName">瑙掕壊鍚嶇О</param>
/// <returns></returns>
- List<RoleDto> GetRoleList(string RoleNo, string RoleName,string UserId);
+ Task<List<RoleDto>> GetRoleList(string RoleNo, string RoleName);
/// <summary>
/// 鏍规嵁缂栧彿鑾峰彇瑙掕壊淇℃伅鍒楄〃
/// </summary>
/// <param name="RoleNo">瑙掕壊缂栧彿</param>
/// <returns></returns>
- int GetRoleByNo(string RoleNo);
+ Task<int> GetRoleByNo(string RoleNo);
/// <summary>
/// 鏂板瑙掕壊鏁版嵁淇℃伅
@@ -54,6 +54,6 @@
/// </summary>
/// <param name="roleid">瑙掕壊id</param>
/// <returns></returns>
- SysRoles GetRoleInfoById(int roleids);
+ Task<SysRoles> GetRoleInfoById(int roleids);
}
}
diff --git a/Wms/WMS.IBLL/ISysServer/IUserInforServer.cs b/Wms/WMS.IBLL/ISysServer/IUserInforServer.cs
index aad638b..2c01207 100644
--- a/Wms/WMS.IBLL/ISysServer/IUserInforServer.cs
+++ b/Wms/WMS.IBLL/ISysServer/IUserInforServer.cs
@@ -10,7 +10,6 @@
public interface IUserInforServer
{
Task<int> LoginAdmin(string loginName, string loginPwd);
- SysUserInfor CeShi();
/// <summary>
/// 鑾峰彇鐢ㄦ埛瑙掕壊淇℃伅
@@ -56,9 +55,8 @@
/// <summary>
/// 鏍规嵁id鑾峰彇鐢ㄦ埛淇℃伅鍒楄〃
/// </summary>
- /// <param name="userids">鐢ㄦ埛id</param>
/// <returns></returns>
- Task<SysUserInfor> GetUserInfoById(int userids);
+ Task<SysUserInfor> GetUserInfoById(int userid);
/// <summary>
/// 淇敼鐢ㄦ埛瀵嗙爜
diff --git a/Wms/Wms/Controllers/BasisController.cs b/Wms/Wms/Controllers/BasisController.cs
index 7980ce4..2370f47 100644
--- a/Wms/Wms/Controllers/BasisController.cs
+++ b/Wms/Wms/Controllers/BasisController.cs
@@ -121,7 +121,6 @@
[ServiceFilter(typeof(ApiResponseActionFilter))]
public async Task InsertUserinfo(UserInfoDto UserInfoDto)
{
- UserInfoDto.CreateUser = _userManager.UserId;
await _userInforServer.InsertUserInfo(UserInfoDto);
await _operation.InsertOperation("绯荤粺璁剧疆", "鐢ㄦ埛绠＄悊", UserInfoDto.UserNo, "娣诲姞", "娣诲姞鐢ㄦ埛淇℃伅 鐢ㄦ埛鍙凤細" + UserInfoDto.UserNo, _userManager.UserId);
@@ -155,7 +154,6 @@
[ServiceFilter(typeof(ApiResponseActionFilter))]
public async Task UpdateUserinfo(UserInfoDto userdto)
{
- userdto.UpdateUser = _userManager.UserId;
await _userInforServer.UpdateUserinfo(userdto);
await _operation.InsertOperation("绯荤粺璁剧疆", "鐢ㄦ埛绠＄悊", userdto.UserNo, "淇敼", "淇敼鐢ㄦ埛淇℃伅 鐢ㄦ埛鍙凤細" + userdto.UserNo, _userManager.UserId);
@@ -165,27 +163,6 @@
#endregion
#region 淇敼瀵嗙爜
-
- /// <summary>
- /// 淇敼瀵嗙爜 鏍规嵁id鑾峰彇鐢ㄦ埛鍘熷瘑鐮�
- /// </summary>
- /// <param name="PassWord">鐢ㄦ埛鍘熷瘑鐮�</param>
- /// <returns></returns>
- //[HttpGet]
- //public async int GetUserUptPassById(string PassWord, int userId)
- //{
- // //鏍规嵁鐢ㄦ埛id鑾峰彇鐢ㄦ埛瀵嗙爜
- // SysUserInfor user = await _userInforServer.GetUserInfoById(userId);
- // //鍒ゆ柇鍘熷瘑鐮佹槸鍚︽纭�
- // if (user.PassWord == PassWord)
- // {
- // return 1;
- // }
- // else
- // {
- // return 0;
- // }
- //}
///// <param name="userId">鐢ㄦ埛id</param>
/// <summary>
@@ -244,29 +221,10 @@
/// <param name="RoleName">瑙掕壊鍚嶇О</param>
/// <returns></returns>
[HttpGet]
- public IActionResult GetRolesList(string RoleNo, string RoleName)
+ [ServiceFilter(typeof(ApiResponseActionFilter))]
+ public async Task<List<RoleDto>> GetRolesList(string RoleNo, string RoleName)
{
- //鑾峰彇褰撳墠鎿嶄綔鐢ㄦ埛id
- var claimsIdentity = this.User.Identity as ClaimsIdentity;
- if (claimsIdentity == null)
- {
- throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
- }
- string UserId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
- if (string.IsNullOrWhiteSpace(UserId))
- {
- throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
- }
-
- //鏌ヨ
- List<RoleDto> roles = _rolesServer.GetRoleList(RoleNo, RoleName, UserId);
- //杩斿洖鏁版嵁
- return Ok(new
- {
- data = roles,
- code = 0,
- msg = "鑾峰彇鎴愬姛"
- });
+ return await _rolesServer.GetRoleList(RoleNo, RoleName);
}
/// <summary>
@@ -275,15 +233,10 @@
/// <param name="roleid">瑙掕壊id</param>
/// <returns></returns>
[HttpGet]
- public IActionResult GetRolesListById(int roleid)
+ [ServiceFilter(typeof(ApiResponseActionFilter))]
+ public async Task<SysRoles> GetRolesListById(int roleid)
{
- SysRoles role = _rolesServer.GetRoleInfoById(roleid);
- return Ok(new
- {
- data = role,
- code = 0,
- msg = "鑾峰彇鎴愬姛"
- });
+ return await _rolesServer.GetRoleInfoById(roleid);
}
/// <summary>
@@ -293,52 +246,13 @@
/// <returns></returns>
/// <exception cref="System.Exception">鎹曡幏寮傚父</exception>
[HttpPost]
- public async Task<IActionResult> InsertRoleInfo(RoleDto roledto)
+ [ServiceFilter(typeof(ApiResponseActionFilter))]
+ [UnitOfWork]
+ public async Task InsertRoleInfo(RoleDto roledto)
{
- //鎹曡幏寮傚父
- try
- {
- //鑾峰彇褰撳墠鎿嶄綔鐢ㄦ埛id
- var claimsIdentity = this.User.Identity as ClaimsIdentity;
- var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
- int uid = Convert.ToInt32(userId);
- //鍒涘缓浜�
- roledto.CreateUser = uid;
- int i = await _rolesServer.InsertRoleInfo(roledto);
- if (i == 0)
- {
- return Ok(new
- {
- data = i,
- code = 1,
- msg = "鏂板澶辫触"
- });
- }
- else if (i == 3)
- {
- return Ok(new
- {
- data = i,
- code = 3,
- msg = "瑙掕壊鍙峰繀椤诲敮涓�"
- });
- }
- else
- {
- await _operation.InsertOperation("绯荤粺璁剧疆", "瑙掕壊鏉冮檺", roledto.RoleNo, "娣诲姞", "娣诲姞瑙掕壊淇℃伅 瑙掕壊鍙凤細" + roledto.RoleNo, uid);
- return Ok(new
- {
- data = i,
- code = 0,
- msg = "鏂板鎴愬姛"
- });
- }
- }
- catch (System.Exception ex)
- {
- //鎶涘嚭寮傚父
- throw new System.Exception("瑙掕壊鏂板寮傚父", ex);
- }
+ await _rolesServer.InsertRoleInfo(roledto);
+ await _operation.InsertOperation("绯荤粺璁剧疆", "瑙掕壊鏉冮檺", roledto.RoleNo, "娣诲姞", "娣诲姞瑙掕壊淇℃伅 瑙掕壊鍙凤細" + roledto.RoleNo, _userManager.UserId);
+
}
/// <summary>
@@ -348,45 +262,14 @@
/// <returns></returns>
/// <exception cref="System.Exception"></exception>
[HttpGet]
- public async Task<IActionResult> DeleteRoleInfo(int roleids)
+ [ServiceFilter(typeof(ApiResponseActionFilter))]
+ [UnitOfWork]
+ public async Task DeleteRoleInfo(int roleids)
{
- //鎹曡幏寮傚父
- try
- {
- //鏍规嵁瑙掕壊id鑾峰彇瑙掕壊淇℃伅
- SysRoles role = _rolesServer.GetRoleInfoById(roleids);
- //鑾峰彇褰撳墠鎿嶄綔鐢ㄦ埛id
- var claimsIdentity = this.User.Identity as ClaimsIdentity;
- var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
- int uid = Convert.ToInt32(userId);
- role.UpdateUser = uid;
- int i = await _rolesServer.DeleteRoleInfo(role);
- //鍒ゆ柇鏄惁鍒犻櫎鎴愬姛
- if (i == 0)
- {
- return Ok(new
- {
- data = i,
- code = 1,
- msg = "鍒犻櫎澶辫触"
- });
- }
- else
- {
- await _operation.InsertOperation("绯荤粺璁剧疆", "瑙掕壊鏉冮檺", role.RoleNo, "鍒犻櫎", "鍒犻櫎瑙掕壊淇℃伅 瑙掕壊鍙凤細" + role.RoleNo, uid);
- return Ok(new
- {
- data = i,
- code = 0,
- msg = "鍒犻櫎鎴愬姛"
- });
- }
- }
- catch (System.Exception ex)
- {
- //鎶涘嚭寮傚父
- throw new System.Exception("瑙掕壊鍒犻櫎寮傚父", ex);
- }
+ //鏍规嵁瑙掕壊id鑾峰彇瑙掕壊淇℃伅
+ SysRoles role = await _rolesServer.GetRoleInfoById(roleids);
+ await _rolesServer.DeleteRoleInfo(role);
+ await _operation.InsertOperation("绯荤粺璁剧疆", "瑙掕壊鏉冮檺", role.RoleNo, "鍒犻櫎", "鍒犻櫎瑙掕壊淇℃伅 瑙掕壊鍙凤細" + role.RoleNo, _userManager.UserId);
}
/// <summary>
@@ -396,45 +279,12 @@
/// <returns></returns>
/// <exception cref="System.Exception">鎹曡幏寮傚父</exception>
[HttpPost]
- public async Task<IActionResult> UpdateRolesInfo(SysRoles role)
+ [ServiceFilter(typeof(ApiResponseActionFilter))]
+ [UnitOfWork]
+ public async Task UpdateRolesInfo(SysRoles role)
{
- //鎹曡幏寮傚父
- try
- {
- //鑾峰彇褰撳墠鎿嶄綔鐢ㄦ埛id
- var claimsIdentity = this.User.Identity as ClaimsIdentity;
- var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
- int uid = Convert.ToInt32(userId);
- //鏇存敼浜�
- role.UpdateUser = uid;
-
- int i = await _rolesServer.UpdateRoleInfo(role);
- //鍒ゆ柇鏄惁缂栬緫鎴愬姛
- if (i == 0)
- {
- return Ok(new
- {
- data = i,
- code = 1,
- msg = "缂栬緫澶辫触"
- });
- }
- else
- {
- await _operation.InsertOperation("绯荤粺璁剧疆", "瑙掕壊鏉冮檺", role.RoleNo, "淇敼", "淇敼瑙掕壊淇℃伅 瑙掕壊鍙凤細" + role.RoleNo, uid);
- return Ok(new
- {
- data = i,
- code = 0,
- msg = "缂栬緫鎴愬姛"
- });
- }
- }
- catch (System.Exception ex)
- {
- //鎶涘嚭寮傚父
- throw new System.Exception("缂栬緫瑙掕壊寮傚父", ex);
- }
+ await _rolesServer.UpdateRoleInfo(role);
+ await _operation.InsertOperation("绯荤粺璁剧疆", "瑙掕壊鏉冮檺", role.RoleNo, "淇敼", "淇敼瑙掕壊淇℃伅 瑙掕壊鍙凤細" + role.RoleNo, _userManager.UserId);
}
#endregion
@@ -446,16 +296,10 @@
/// </summary>
/// <returns></returns>
[HttpGet]
- public IActionResult GetRBACLists(int id)
+ [ServiceFilter(typeof(ApiResponseActionFilter))]
+ public async Task<List<FunctionMenuDto>> GetRBACLists(int id)
{
- //List<RoleRightDto> roleright =
- var obj = _rBACServer.GetMenuByroleIdNew(id);
- return Ok(new
- {
- data = obj,
- code = 0,
- msg = "鎴愬姛"
- });
+ return await _rBACServer.GetMenuByroleIdNew(id);
}
@@ -464,27 +308,10 @@
/// </summary>
/// <returns></returns>
[HttpGet]
- public IActionResult GetRoleRightRBAC(int id, string MenuNo)
+ [ServiceFilter(typeof(ApiResponseActionFilter))]
+ public async Task<List<FunctionMenuDto>> GetRoleRightRBAC(int id, string MenuNo)
{
- //鑾峰彇褰撳墠鎿嶄綔鐢ㄦ埛id
- var claimsIdentity = this.User.Identity as ClaimsIdentity;
- if (claimsIdentity == null)
- {
- throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
- }
- string UserId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
- if (string.IsNullOrWhiteSpace(UserId))
- {
- throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
- }
-
- List<FunctionMenuDto> menudto = _rBACServer.GetRoleRightRBAC(MenuNo, UserId);
- return Ok(new
- {
- data = menudto,
- code = 0,
- msg = "鎴愬姛"
- });
+ return await _rBACServer.GetRoleRightRBAC(MenuNo, UserId);
}
/// <summary>
@@ -492,15 +319,10 @@
/// </summary>
/// <returns></returns>
[HttpGet]
- public IActionResult GetRoleRightLists(int id)
+ [ServiceFilter(typeof(ApiResponseActionFilter))]
+ public async Task<List<RoleRightDto>> GetRoleRightLists(int id)
{
- List<RoleRightDto> roleRightDtos = _rBACServer.GetRoleRightList(id);
- return Ok(new
- {
- data = roleRightDtos,
- code = 0,
- msg = "鎴愬姛"
- });
+ return await _rBACServer.GetRoleRightList(id);
}
/// <summary>
@@ -509,33 +331,10 @@
/// </summary>
/// <returns></returns>
[HttpGet]
- public IActionResult GetRoleRightList()
+ [ServiceFilter(typeof(ApiResponseActionFilter))]
+ public async Task<List<RoleRightDto>> GetRoleRightList()
{
- try
- {
- //鑾峰彇褰撳墠鐧诲綍鐨勭敤鎴稩D
- var claimsIdentity = this.User.Identity as ClaimsIdentity;
- if (claimsIdentity == null)
- {
- return Ok(new { code = 1, msg = "涓鸿幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
- }
- var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
- if (string.IsNullOrWhiteSpace(userId))
- {
- return Ok(new { code = 1, msg = "涓鸿幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
- }
- var roleRightDtos = _roleRightServer.GetRoleMenuList(int.Parse(userId));
- return Ok(new
- {
- data = roleRightDtos,
- msg = "鎴愬姛",
- code = 0
- });
- }
- catch (Exception e)
- {
- return Ok(new { msg = e.Message, code = 0 });
- }
+ return await _roleRightServer.GetRoleMenuList();
}
/// <summary>
@@ -544,15 +343,10 @@
/// <param name="id">瑙掕壊鏉冮檺id</param>
/// <returns></returns>
[HttpGet]
- public IActionResult GetRoleRightOneListById(int id)
+ [ServiceFilter(typeof(ApiResponseActionFilter))]
+ public async Task<List<SysRoleRight>> GetRoleRightOneListById(int id)
{
- List<SysRoleRight> roleRights = _roleRightServer.GetRoleRightOneListById(id);
- return Ok(new
- {
- data = roleRights,
- msg = "鎴愬姛",
- core = 0
- });
+ return await _roleRightServer.GetRoleRightOneListById(id);
}
/// <summary>
@@ -563,46 +357,16 @@
/// <returns></returns>
/// <exception cref="Exception">鎹曡幏寮傚父</exception>
[HttpPost]
- public async Task<IActionResult> InsertRoleRight(string MenuNo, int id)
+ [ServiceFilter(typeof(ApiResponseActionFilter))]
+ [UnitOfWork]
+ public async Task InsertRoleRight(string MenuNo, int id)
{
- //鎹曡幏寮傚父
- try
- {
- //鑾峰彇褰撳墠鎿嶄綔鐢ㄦ埛id
- var claimsIdentity = this.User.Identity as ClaimsIdentity;
- var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
-
- //鏍规嵁Id鑾峰彇瑙掕壊鍙�
- SysRoles roles = _rolesServer.GetRoleInfoById(id);
-
- //淇濆瓨瑙掕壊鏉冮檺淇℃伅
- int i = await _roleRightServer.InsertRoleRight(MenuNo, roles.RoleNo, userId);
- //鍒ゆ柇鏄惁鏂板鎴愬姛
- if (i == 0)
- {
- return Ok(new
- {
- data = i,
- msg = "鍒嗛厤澶辫触",
- code = 1
- });
- }
- else
- {
- await _operation.InsertOperation("绯荤粺璁剧疆", "瑙掕壊鏉冮檺", roles.RoleNo, "淇敼", "鍒嗛厤瑙掕壊鏉冮檺 瑙掕壊鍙凤細" + roles.RoleNo, Convert.ToInt32(userId));
- return Ok(new
- {
- data = i,
- msg = "鍒嗛厤鎴愬姛",
- code = 0
- });
- }
- }
- catch (Exception ex)
- {
- //鎶涘嚭寮傚父
- throw new Exception("鏂板瑙掕壊鏉冮檺淇℃伅寮傚父", ex);
- }
+ //鏍规嵁Id鑾峰彇瑙掕壊鍙�
+ SysRoles roles = await _rolesServer.GetRoleInfoById(id);
+ //淇濆瓨瑙掕壊鏉冮檺淇℃伅
+ await _roleRightServer.InsertRoleRight(MenuNo, roles.RoleNo);
+ await _operation.InsertOperation("绯荤粺璁剧疆", "瑙掕壊鏉冮檺", roles.RoleNo, "淇敼", "鍒嗛厤瑙掕壊鏉冮檺 瑙掕壊鍙凤細" + roles.RoleNo, _userManager.UserId);
+
}
#endregion
diff --git a/Wms/Wms/Controllers/WeatherForecastController.cs b/Wms/Wms/Controllers/WeatherForecastController.cs
index 145995d..2ef1ab4 100644
--- a/Wms/Wms/Controllers/WeatherForecastController.cs
+++ b/Wms/Wms/Controllers/WeatherForecastController.cs
@@ -19,6 +19,7 @@
{
[Route("api/[controller]/[action]")]
[ApiController]
+ [ServiceFilter(typeof(ApiResponseActionFilter))]
public class WeatherForecastController : ControllerBase
{
private static readonly string[] Summaries = new[]
@@ -37,21 +38,21 @@
_userMan = userMan;
}
- [HttpGet]
- public IEnumerable<WeatherForecast> Get()
- {
- var rng = new Random();
- var data = Enumerable.Range(1, 5).Select(index => new WeatherForecast
- {
- Date = DateTime.Now.AddDays(index),
- TemperatureC = rng.Next(-20, 55),
- Summary = Summaries[rng.Next(Summaries.Length)]
- })
- .ToArray();
- var list = JsonConvert.SerializeObject(data);
- _logger.LogWarning("鎺ユ敹鐗╂枡杞Щ浠诲姟锛�(" + list + "),");
- return data;
- }
+ //[HttpGet]
+ //public IEnumerable<WeatherForecast> Get()
+ //{
+ // var rng = new Random();
+ // var data = Enumerable.Range(1, 5).Select(index => new WeatherForecast
+ // {
+ // Date = DateTime.Now.AddDays(index),
+ // TemperatureC = rng.Next(-20, 55),
+ // Summary = Summaries[rng.Next(Summaries.Length)]
+ // })
+ // .ToArray();
+ // var list = JsonConvert.SerializeObject(data);
+ // _logger.LogWarning("鎺ユ敹鐗╂枡杞Щ浠诲姟锛�(" + list + "),");
+ // return data;
+ //}
/// <summary>
/// 鐧诲綍
@@ -59,7 +60,6 @@
/// <param name="model">鐧诲綍鍚�</param>
/// <returns></returns>
[HttpPost]
- [ServiceFilter(typeof(ApiResponseActionFilter))]
public async Task<string> Login(LoginVm model)
{
if (ModelState.IsValid)
@@ -98,30 +98,30 @@
/// 鐧诲綍
/// </summary>
/// <returns></returns>
- [HttpPost]
- public IActionResult ceshi()
- {
- //if (ModelState.IsValid)
- //{
- try
- {
- //鑾峰彇褰撳墠鐧诲綍鐨勭敤鎴稩D
- var claimsIdentity = this.User.Identity as ClaimsIdentity;
- var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
- var bolls = _userMan.CeShi();
+ //[HttpPost]
+ //public IActionResult ceshi()
+ //{
+ // //if (ModelState.IsValid)
+ // //{
+ // try
+ // {
+ // //鑾峰彇褰撳墠鐧诲綍鐨勭敤鎴稩D
+ // var claimsIdentity = this.User.Identity as ClaimsIdentity;
+ // var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
+ // var bolls = _userMan.CeShi();
- return Ok(new { code = 200, data = bolls });
+ // return Ok(new { code = 200, data = bolls });
- }
- catch (Exception e)
- {
- return Ok(new { code = 400, ErrorMsg = "璇疯仈绯荤鐞嗗憳/" + e.Message });
- }
- //}
- //else //鏁版嵁鏍煎紡閿欒
- //{
- // return Ok(new { code = 400, ErrorMsg = "鏁版嵁鏍煎紡閿欒" });
- //}
- }
+ // }
+ // catch (Exception e)
+ // {
+ // return Ok(new { code = 400, ErrorMsg = "璇疯仈绯荤鐞嗗憳/" + e.Message });
+ // }
+ // //}
+ // //else //鏁版嵁鏍煎紡閿欒
+ // //{
+ // // return Ok(new { code = 400, ErrorMsg = "鏁版嵁鏍煎紡閿欒" });
+ // //}
+ //}
}
}
--
Gitblit v1.8.0