Bladeren bron

优化按钮接口

魏超 5 jaren geleden
bovenliggende
commit
09470e1445

+ 0
- 5
src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java Bestand weergeven

243
             List<SysMenu> allMenus = (List<SysMenu>) iTaUserAuthMenuService.getAllMenu(null, null).getData();
243
             List<SysMenu> allMenus = (List<SysMenu>) iTaUserAuthMenuService.getAllMenu(null, null).getData();
244
             List<SysButtonInMenu> allButtons = (List<SysButtonInMenu>) iTaUserAuthButtonService.getAllButton(null, null).getData();
244
             List<SysButtonInMenu> allButtons = (List<SysButtonInMenu>) iTaUserAuthButtonService.getAllButton(null, null).getData();
245
 
245
 
246
-            allButtons.forEach(e -> {
247
-                List<TaRole> taRoles = taRoleMapper.getRolesByBtnId(e.getBtnId());
248
-                e.setRolesList(taRoles);
249
-            });
250
-
251
             userMap.put("taUser", taUser);
246
             userMap.put("taUser", taUser);
252
             userMap.put("menuList", allMenus);
247
             userMap.put("menuList", allMenus);
253
             userMap.put("buttonList", allButtons);
248
             userMap.put("buttonList", allButtons);

+ 8
- 13
src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserAuthButtonServiceImpl.java Bestand weergeven

11
 import com.huiju.estateagents.center.taUser.service.ITaUserAuthButtonService;
11
 import com.huiju.estateagents.center.taUser.service.ITaUserAuthButtonService;
12
 import com.huiju.estateagents.entity.SysButtonInMenu;
12
 import com.huiju.estateagents.entity.SysButtonInMenu;
13
 import com.huiju.estateagents.entity.SysMenu;
13
 import com.huiju.estateagents.entity.SysMenu;
14
+import com.huiju.estateagents.entity.TaRole;
14
 import com.huiju.estateagents.entity.TaRoleButton;
15
 import com.huiju.estateagents.entity.TaRoleButton;
15
 import com.huiju.estateagents.mapper.TaRoleButtonMapper;
16
 import com.huiju.estateagents.mapper.TaRoleButtonMapper;
17
+import com.huiju.estateagents.mapper.TaRoleMapper;
16
 import org.springframework.beans.factory.annotation.Autowired;
18
 import org.springframework.beans.factory.annotation.Autowired;
17
 import org.springframework.stereotype.Service;
19
 import org.springframework.stereotype.Service;
18
 
20
 
34
     TaRoleButtonMapper taRoleButtonMapper;
36
     TaRoleButtonMapper taRoleButtonMapper;
35
     @Autowired
37
     @Autowired
36
     private TaUserMapper taUserMapper;
38
     private TaUserMapper taUserMapper;
39
+    @Autowired
40
+    private TaRoleMapper taRoleMapper;
37
 
41
 
38
     @Override
42
     @Override
39
     public ResponseBean getButtonByUserId(Integer pageNum, Integer pageSize, String userId) {
43
     public ResponseBean getButtonByUserId(Integer pageNum, Integer pageSize, String userId) {
44
     @Override
48
     @Override
45
     public ResponseBean getAllButton(Integer pageNum, Integer pageSize) {
49
     public ResponseBean getAllButton(Integer pageNum, Integer pageSize) {
46
         List<SysButtonInMenu> records = taUserAuthButtonMapper.sysButtonListByRoleId();
50
         List<SysButtonInMenu> records = taUserAuthButtonMapper.sysButtonListByRoleId();
47
-
48
-        QueryWrapper<TaRoleButton> queryWrapper = new QueryWrapper();
49
-        List<TaRoleButton> taRoleButtons = taRoleButtonMapper.selectList(queryWrapper);
50
-
51
-        for (SysButtonInMenu sysButtonInMenu : records){
52
-            ArrayList<Integer> roles = new ArrayList<>();
53
-            for (TaRoleButton taRoleButton : taRoleButtons){
54
-                if (sysButtonInMenu.getBtnId().equals(taRoleButton.getBtnId()) && !roles.contains(taRoleButton.getBtnId())){
55
-                    roles.add(taRoleButton.getBtnId());
56
-                }
57
-            }
58
-            sysButtonInMenu.setRoles(roles);
59
-        }
51
+        records.forEach(e -> {
52
+            List<TaRole> taRoles = taRoleMapper.getRolesByBtnId(e.getBtnId());
53
+            e.setRolesList(taRoles);
54
+        });
60
 
55
 
61
         return ResponseBean.success(records);
56
         return ResponseBean.success(records);
62
     }
57
     }