Explorar el Código

催款日志新增创建时间

anderx hace 4 años
padre
commit
8f12a0126a

+ 11 - 1
src/main/java/com/goafanti/common/controller/BaseController.java

@@ -117,9 +117,9 @@ public class BaseController {
 		model.addAttribute("avatarUploadHost", avatarUploadHost);
 		model.addAttribute("portalHost", portalHost);
 		model.addAttribute("basePath", request.getContextPath());
-		model.addAttribute("shiro", SecurityUtils.getSubject());
 		model.addAttribute("isLogin", TokenManager.isLogin());
 		model.addAttribute("csrf", TokenManager.getCSRF());
+		model.addAttribute("shiro", SecurityUtils.getSubject());
 		model.addAttribute("isAdmin", false);
 		if (TokenManager.isLogin() && TokenManager.getToken() instanceof User) {
 			model.addAttribute("userData", TokenManager.getUserToken());
@@ -130,6 +130,16 @@ public class BaseController {
 			model.addAttribute("userName", TokenManager.getAdminToken().getName());
 			model.addAttribute("departmentId", TokenManager.getAdminToken().getDepartmentId());
 			model.addAttribute("isAdmin", true);
+			//按钮控制
+			boolean legalAffairs=true;
+			if (TokenManager.hasPermission("/admin/legalAffairs.html")){
+				if (TokenManager.hasRole(AFTConstants.VICE_CEO)||TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)||
+						TokenManager.hasRole(AFTConstants.CED)||TokenManager.hasRole(AFTConstants.CED_ASSISTANT)){
+					legalAffairs=false;
+				}
+			}
+			model.addAttribute("legalAffairs", legalAffairs);
+
 		}
 	}
 }

+ 0 - 1
src/main/java/com/goafanti/order/bo/InputOrderLegalAffairs.java

@@ -23,7 +23,6 @@ public class InputOrderLegalAffairs {
     /**
      * 0否 1已回款 2已诉讼 3已坏账处理
      */
-    @NotNull(message = "{"+ ErrorConstants.PARAM_EMPTY_ERROR +"}")
     private Integer status;
 
     /**

+ 2 - 27
src/main/webapp/WEB-INF/views/common.html

@@ -367,36 +367,11 @@
 				departmentId : /*[[${adminData.departmentId}]]*/'',
 				isSuperAdmin : /*[[${shiro.hasRole('999999')}]]*/false,
 				isApprovalDecision : /*[[${shiro.hasRole('99999')}]]*/false,
-				role :/*[[${role}]]*/''
-			}
-			window.showUserManage = /*[[${shiro.hasRole('999999') || shiro.isPermitted('admin/userManage')}]]*/false;
-			window.showServices = /*[[${shiro.hasRole('999999') || shiro.isPermitted('admin/services')}]]*/false;
-			window.showAchievement = /*[[${shiro.hasRole('999999') || shiro.isPermitted('admin/achievement')}]]*/false;
-			window.showDemand = /*[[${shiro.hasRole('999999') || shiro.isPermitted('admin/demand')}]]*/false;
-			window.showIdea = /*[[${shiro.hasRole('999999') || shiro.isPermitted('admin/idea')}]]*/false;
-			window.showCustomer = /*[[${shiro.hasRole('999999') || shiro.isPermitted('admin/customer')}]]*/false;
-			window.showUserList = /*[[${shiro.hasRole('999999') || shiro.isPermitted('api/admin/userList')}]]*/false;
-			window.showOrgList = /*[[${shiro.hasRole('999999') || shiro.isPermitted('api/admin/orgList')}]]*/false;
-			window.showPermissionList = /*[[${shiro.hasRole('999999') || shiro.isPermitted('api/admin/permissionList')}]]*/false;
-			window.showRoleList = /*[[${shiro.hasRole('999999') || shiro.isPermitted('api/admin/roleList')}]]*/false;
-			window.showAuditStatus = /*[[${shiro.hasRole('999999') || shiro.isPermitted('api/admin/auditStatus')}]]*/false;
-			window.showUserOrderList = /*[[${shiro.hasRole('999999') || shiro.isPermitted('admin/userOrder')}]]*/false;
-			window.showSystem = /*[[${shiro.hasRole('999999') || shiro.isPermitted('admin/system')}]]*/false;
-			/*]]>*/
-		</script>
-		<script th:inline="javascript" th:if="${userData!=null}">
-			/*<![CDATA[*/
-			window.userData = {
-				mobile : /*[[${userData.mobile}]]*/'',
-				nickname : /*[[${userData == null} ? null : ${userData.nickname}]]*/'',
-				number : /*[[${userData == null} ? null : ${userData.number}]]*/'',
-				type : /*[[${userData == null} ? null : ${userData.type}]]*/'',
-				email : /*[[${userData == null} ? null : ${userData.email}]]*/'',
-				createTime : /*[[${userData == null} ? null : ${userData.createTime}]]*/'',
-				lvl : /*[[${userData == null} ? null : ${userData.lvl}]]*/''
+				legalAffairs: /*[[${legalAffairs}]]*/true
 			}
 			/*]]>*/
 		</script>
+
 		<th:block th:replace="${scripts}" />
 	</th:block>