角色加描述

resource/WEB-INF/salaryoptconfig.xml

@@ -4,20 +4,13 @@
     <module name="我的薪资福利" key="myBill">
         <page name="我的薪资福利" key="myBill">
             <opt name="查询" key="query" able="true"/>
-            <opt name="新增" key="add"/>
-            <opt name="编辑" key="edit"/>
-            <opt name="删除" key="del"/>
         </page>
     </module>
 
     <module name="薪资档案" key="salaryArchive">
         <page name="薪资档案" key="salaryArchive">
-            <opt name="查询" key="query" able="true"/>
-            <opt name="定薪" key="edit"/>
-            <opt name="调薪" key="调薪"/>
-            <opt name="停薪" key="停薪"/>
-            <opt name="取消停薪" key="取消停薪"/>
-            <opt name="删除" key="del"/>
+            <opt name="查询" key="query"/>
+            <opt name="管理" key="admin"/>
         </page>
     </module>
 

src/com/engine/salary/entity/auth/param/AuthRoleSaveParam.java

@@ -23,9 +23,9 @@ public class AuthRoleSaveParam {
     @DataCheck(require = true, max = 40, message = "名称不允许为空,名称不能超过40个字符")
     private String name;
 
-//
-//    @DataCheck(require = true, max = 400, message = "名称不允许为空,名称不能超过400个字符")
-//    private String description;
+
+    @DataCheck(require = true, max = 400, message = "名称不允许为空,名称不能超过400个字符")
+    private String description;
 
     /**
      * 扣缴义务人id

src/com/engine/salary/entity/taxagent/bo/TaxAgentBO.java

@@ -176,7 +176,8 @@ public class TaxAgentBO {
                     map.put("id", e.getId());
                     map.put("name", e.getName());
                     map.put("employeeRange", "设置");
-                    map.put("role", rolelistMap.getOrDefault(e.getId(), Collections.emptyList()).stream().map(AuthRolePO::getName).collect(Collectors.joining(",")));
+//                    map.put("role", rolelistMap.getOrDefault(e.getId(), Collections.emptyList()).stream().map(AuthRolePO::getName).collect(Collectors.joining(",")));
+                    map.put("role", rolelistMap.getOrDefault(e.getId(), Collections.emptyList()));
                     if (isDevolution) {
                         List<Long> empIds = taxAgentAdmins.stream().filter(t -> t.getTaxAgentId().equals(e.getId())).map(TaxAgentAdminPO::getEmployeeId).collect(Collectors.toList());
                         List<String> admins = adminList.stream().filter(a -> empIds.contains(a.getEmployeeId())).map(DataCollectionEmployee::getUsername).collect(Collectors.toList());

src/com/engine/salary/service/auth/AuthRoleServiceImpl.java

@@ -48,13 +48,16 @@ public class AuthRoleServiceImpl extends Service implements AuthRoleService {
         Date now = new Date();
         Long id = param.getId();
         String name = param.getName();
+        String description = param.getDescription();
         Long taxAgentId = param.getTaxAgentId();
 
+
         AuthRolePO po;
         if (id == null) {
             po = AuthRolePO.builder()
                     .id(IdGenerator.generate())
                     .name(name)
+                    .description(description)
                     .taxAgentId(taxAgentId)
                     .creator((long) user.getUID())
                     .createTime(now)
@@ -82,6 +85,7 @@ public class AuthRoleServiceImpl extends Service implements AuthRoleService {
             AuthRolePO newPo = AuthRolePO.builder()
                     .id(id)
                     .name(name)
+                    .description(description)
                     .taxAgentId(po.getTaxAgentId())
                     .updateTime(now)
                     .build();

src/com/engine/salary/service/auth/AuthService.java

@@ -0,0 +1,17 @@
+package com.engine.salary.service.auth;
+
+import com.engine.salary.entity.auth.dto.AuthDTO;
+
+import java.util.List;
+
+/**
+ * 权限
+ * <p>Copyright: Copyright (c) 2024</p>
+ * <p>Company: 泛微软件</p>
+ *
+ * @author qiantao
+ * @version 1.0
+ **/
+public interface AuthService {
+    List<AuthDTO> auth(String page);
+}

src/com/engine/salary/service/auth/AuthServiceImpl.java

@@ -0,0 +1,20 @@
+package com.engine.salary.service.auth;
+
+import com.engine.core.impl.Service;
+import com.engine.salary.entity.auth.dto.AuthDTO;
+import com.engine.salary.mapper.auth.AuthMapper;
+import com.engine.salary.util.db.MapperProxyFactory;
+
+import java.util.List;
+
+public class AuthServiceImpl extends Service implements AuthService {
+    private AuthMapper getAuthMapper() {
+        return MapperProxyFactory.getProxy(AuthMapper.class);
+    }
+
+    @Override
+    public List<AuthDTO> auth(String page) {
+        return getAuthMapper().getAuth((long) user.getUID(), page);
+    }
+
+}

src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java

@@ -184,6 +184,11 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe
             queryParam.setPayEndDateEndDate(SalaryDateUtil.stringToDate(queryParam.getPayEndDateEndDateStr()));
         }
 
+        //能查看哪些档案
+
+        //能管理哪些档案
+
+
         List<SalaryArchiveListDTO> list = getSalaryArchiveMapper().list(queryParam);
         return SalaryI18nUtil.i18nList(list);
     }