合并

src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java

@@ -243,11 +243,6 @@ public class TaUserController extends BaseController {
             List<SysMenu> allMenus = (List<SysMenu>) iTaUserAuthMenuService.getAllMenu(null, null).getData();
             List<SysButtonInMenu> allButtons = (List<SysButtonInMenu>) iTaUserAuthButtonService.getAllButton(null, null).getData();
 
-            allButtons.forEach(e -> {
-                List<TaRole> taRoles = taRoleMapper.getRolesByBtnId(e.getBtnId());
-                e.setRolesList(taRoles);
-            });
-
             userMap.put("taUser", taUser);
             userMap.put("menuList", allMenus);
             userMap.put("buttonList", allButtons);

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserAuthButtonServiceImpl.java

@@ -11,8 +11,10 @@ import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
 import com.huiju.estateagents.center.taUser.service.ITaUserAuthButtonService;
 import com.huiju.estateagents.entity.SysButtonInMenu;
 import com.huiju.estateagents.entity.SysMenu;
+import com.huiju.estateagents.entity.TaRole;
 import com.huiju.estateagents.entity.TaRoleButton;
 import com.huiju.estateagents.mapper.TaRoleButtonMapper;
+import com.huiju.estateagents.mapper.TaRoleMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -34,6 +36,8 @@ public class TaUserAuthButtonServiceImpl extends ServiceImpl<TaUserAuthButtonMap
     TaRoleButtonMapper taRoleButtonMapper;
     @Autowired
     private TaUserMapper taUserMapper;
+    @Autowired
+    private TaRoleMapper taRoleMapper;
 
     @Override
     public ResponseBean getButtonByUserId(Integer pageNum, Integer pageSize, String userId) {
@@ -44,19 +48,10 @@ public class TaUserAuthButtonServiceImpl extends ServiceImpl<TaUserAuthButtonMap
     @Override
     public ResponseBean getAllButton(Integer pageNum, Integer pageSize) {
         List<SysButtonInMenu> records = taUserAuthButtonMapper.sysButtonListByRoleId();
-
-        QueryWrapper<TaRoleButton> queryWrapper = new QueryWrapper();
-        List<TaRoleButton> taRoleButtons = taRoleButtonMapper.selectList(queryWrapper);
-
-        for (SysButtonInMenu sysButtonInMenu : records){
-            ArrayList<Integer> roles = new ArrayList<>();
-            for (TaRoleButton taRoleButton : taRoleButtons){
-                if (sysButtonInMenu.getBtnId().equals(taRoleButton.getBtnId()) && !roles.contains(taRoleButton.getBtnId())){
-                    roles.add(taRoleButton.getBtnId());
-                }
-            }
-            sysButtonInMenu.setRoles(roles);
-        }
+        records.forEach(e -> {
+            List<TaRole> taRoles = taRoleMapper.getRolesByBtnId(e.getBtnId());
+            e.setRolesList(taRoles);
+        });
 
         return ResponseBean.success(records);
     }

src/main/java/com/huiju/estateagents/service/impl/TaChatServiceImpl.java

@@ -149,7 +149,7 @@ public class TaChatServiceImpl extends ServiceImpl<TaChatMapper, TaChat> impleme
 
                 miniAppService.sendNoticeMessage(to, link, StringUtils.ifNull(from.getName(), from.getNickname()), StringUtils.ifNull(from.getTel(), from.getPhone()), "给您发送了一条新消息, 请查收", LocalDateTime.now());
             } else {
-                taChat.setIsRead(CommConstant.MESSAGE_READED);
+//                taChat.setIsRead(CommConstant.MESSAGE_READED);
             }
         }
 

src/main/java/com/huiju/estateagents/service/impl/TaPersonServiceImpl.java

@@ -329,8 +329,9 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         result.put("nickname", taPerson.getNickname());
         result.put("avatar", taPerson.getAvatarurl());
         result.put("sex", taPerson.getSex());
-        result.put("phone", taPerson.getTel());
+        result.put("phone",StringUtils.ifNull(taPerson.getTel(),taPerson.getPhone()) );
         result.put("points", taPerson.getPoints());
+        result.put("personType",taPerson.getPersonType());
 
        // 查询最早的签到记录
         TaPersonSign taPersonSign = taPersonSignMapper.getLastSignRecord(taPerson.getPersonId());