Merge branch 'v3' of http://git.ycjcjy.com/zhiyuxing/estateagents into v3

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/controller/TaChannelController.java

@@ -183,7 +183,7 @@ public class TaChannelController extends BaseController {
     @RequestMapping(value="/admin/channel/broker",method= RequestMethod.GET)
     public  ResponseBean channelBrokerList(@RequestParam(value="name",required = false) String name,
                                            @RequestParam(value="phone",required = false) String phone,
-                                           @RequestParam(value="phone",required = false) Integer channelId,
+                                           @RequestParam(value="channelId",required = false) Integer channelId,
                                            @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                            HttpServletRequest request){

src/main/resources/mapper/TaPersonMapper.xml

@@ -515,7 +515,6 @@ FROM
         <if test="phone !=null and phone !=''">
             and rc.phone = #{phone}
         </if>
-            and p.person_type = 'estate agent'
             and p.org_id= #{orgid}
             and tch.channel_id = #{channelId}
         </where>