Merge branch 'huangyuan-user' of lift-manager/lift-server into develop

lift-system-service/src/main/java/cn/com/ty/lift/system/settings/dao/entity/GlobalSet.java

@@ -28,8 +28,8 @@ public class GlobalSet implements Serializable {
     /**
      * 主键id
      */
-    @TableId(value = "id",type = IdType.AUTO)
-    private Integer id;
+    @TableId(value = "id",type = IdType.ID_WORKER)
+    private Long id;
 
     /**
      * 设置名称

lift-system-service/src/main/java/cn/com/ty/lift/system/settings/dao/entity/MtCompanyAttestation.java

@@ -1,7 +1,6 @@
 package cn.com.ty.lift.system.settings.dao.entity;
 
 import cn.com.ty.lift.system.settings.dao.entity.model.CompanyAttestationRequest;
-import cn.com.ty.lift.common.utils.PojoUtils;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
@@ -16,7 +15,7 @@ import java.time.LocalDateTime;
  * 公司认证信息
  * </p>
  *
- * @author wang-hai-cheng
+ * @author huangy
  * @since 2019-12-12
  */
 @Data
@@ -126,6 +125,12 @@ public class MtCompanyAttestation implements Serializable {
     }
 
     public MtCompanyAttestation(CompanyAttestationRequest companyAttestationRequest) {
-        PojoUtils.pojoCopy(this, companyAttestationRequest);
+        this.mtCompanyId = companyAttestationRequest.getMtCompanyId();
+        this.attestationName = companyAttestationRequest.getAttestationName();
+        this.contactsName = companyAttestationRequest.getContactsName();
+        this.contactsTel = companyAttestationRequest.getContactsTel();
+        this.businessLicenseAnnex = companyAttestationRequest.getBusinessLicenseAnnex();
+        this.taxRegistration = companyAttestationRequest.getTaxRegistration();
+        this.logoImg = companyAttestationRequest.getLogoImg();
     }
 }

lift-system-service/src/main/java/cn/com/ty/lift/system/settings/dao/entity/model/CompanyAttestationResponse.java

@@ -1,5 +1,6 @@
 package cn.com.ty.lift.system.settings.dao.entity.model;
 
+import cn.com.ty.lift.system.settings.dao.entity.MtCompanyAttestation;
 import lombok.Data;
 
 import java.time.LocalDateTime;
@@ -11,10 +12,30 @@ import java.time.LocalDateTime;
  */
 @Data
 public class CompanyAttestationResponse {
+    private Long id;//申请信息id
     private String logoImg;//logo路径
     private String attestationName;//公司名称
     private String contactsName;//联系人
     private String contactsTel;//联系人电话号码
+    private String businessLicenseAnnex;//企业营业执照路径
+    private String taxRegistration;//资质证书
+    private String createUser;//创建人
     private LocalDateTime createTime;//申请时间
     private LocalDateTime dealTime;//处理时间
+    private String customerManagerName;//客户经理名称
+
+    public CompanyAttestationResponse(){}
+
+    public CompanyAttestationResponse(MtCompanyAttestation mtCompanyAttestation){
+        this.id = mtCompanyAttestation.getId();
+        this.logoImg = mtCompanyAttestation.getLogoImg();
+        this.attestationName = mtCompanyAttestation.getAttestationName();
+        this.contactsName = mtCompanyAttestation.getContactsName();
+        this.contactsTel = mtCompanyAttestation.getContactsTel();
+        this.businessLicenseAnnex = mtCompanyAttestation.getBusinessLicenseAnnex();
+        this.taxRegistration = mtCompanyAttestation.getTaxRegistration();
+        this.createUser = mtCompanyAttestation.getCreateUser();
+        this.createTime = mtCompanyAttestation.getCreateTime();
+        this.dealTime = mtCompanyAttestation.getDealTime();
+    }
 }

lift-system-service/src/main/java/cn/com/ty/lift/system/settings/service/impl/MaintenanceCompanyServiceImpl.java

@@ -85,7 +85,7 @@ public class MaintenanceCompanyServiceImpl extends ServiceImpl<MaintenanceCompan
         //1.设置申请用户为企业管理员
         UserAccount userAccount = userAccountService.getByUserId(userId);
         userAccount.setType(ApiConstants.UserConstants.TYPE_ENTERPRISE_ADMIN);
-        userAccountService.save(userAccount);
+        userAccountService.updateById(userAccount);
         //2.设置用户类型为企业管理员
         MtCompanyUser mtCompanyUser = new MtCompanyUser();
         mtCompanyUser.setCreateUserId(userId);
@@ -105,7 +105,7 @@ public class MaintenanceCompanyServiceImpl extends ServiceImpl<MaintenanceCompan
         userRole.setCompanyId(companyId);
         userRoleService.save(userRole);
 
-        return RestResponse.success(null, ApiConstants.RESULT_SUCCESS, "申请团队成功");
+        return RestResponse.success(null, ApiConstants.RESULT_SUCCESS, "创建团队成功");
     }
 
     @Override

lift-system-service/src/main/java/cn/com/ty/lift/system/settings/service/impl/MtCompanyAttestationServiceImpl.java

@@ -2,18 +2,22 @@ package cn.com.ty.lift.system.settings.service.impl;
 
 import cn.com.ty.lift.common.constants.ApiConstants;
 import cn.com.ty.lift.common.utils.PojoUtils;
+import cn.com.ty.lift.common.utils.ProjectUtils;
 import cn.com.ty.lift.system.settings.dao.entity.MaintenanceCompany;
 import cn.com.ty.lift.system.settings.dao.entity.MtCompanyAttestation;
 import cn.com.ty.lift.system.settings.dao.entity.model.CompanyAttestationRequest;
+import cn.com.ty.lift.system.settings.dao.entity.model.CompanyAttestationResponse;
 import cn.com.ty.lift.system.settings.dao.mapper.MtCompanyAttestationMapper;
 import cn.com.ty.lift.system.settings.service.GlobalSetService;
 import cn.com.ty.lift.system.settings.service.IMaintenanceCompanyService;
 import cn.com.ty.lift.system.settings.service.IMtCompanyAttestationService;
 import cn.com.ty.lift.system.user.dao.entity.UserAccount;
+import cn.com.ty.lift.system.user.dao.entity.UserInfo;
 import cn.com.ty.lift.system.user.dao.entity.model.MenuRequest;
 import cn.com.ty.lift.system.user.service.IMenuService;
 import cn.com.ty.lift.system.user.service.IRoleService;
 import cn.com.ty.lift.system.user.service.IUserAccountService;
+import cn.com.ty.lift.system.user.service.IUserInfoService;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -25,6 +29,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -52,9 +59,13 @@ public class MtCompanyAttestationServiceImpl extends ServiceImpl<MtCompanyAttest
     @Autowired
     private IUserAccountService userAccountService;
 
+    @Autowired
+    private IUserInfoService userInfoService;
+
     @Override
     @Transactional
     public RestResponse applyAudit(CompanyAttestationRequest companyAttestationRequest) {
+        UserInfo userInfo = userInfoService.getByUserId(companyAttestationRequest.getUserId());
         MtCompanyAttestation mtCompanyAttestation = new MtCompanyAttestation(companyAttestationRequest);
         if (mtCompanyAttestation.getId() != null) {
             //如果用户是重新认证，获取认证对象
@@ -62,7 +73,13 @@ public class MtCompanyAttestationServiceImpl extends ServiceImpl<MtCompanyAttest
             //属性赋值，将前端修改的值赋值给原来的认证对象
             PojoUtils.pojoCopy(mtCompanyAttestationInfo, mtCompanyAttestation);
             mtCompanyAttestation = mtCompanyAttestationInfo;
+        } else {
+            if(userInfo != null){
+                //如果是新建,设置创建者名称
+                mtCompanyAttestation.setCreateUser(userInfo.getName());
+            }
         }
+
         //获取公司信息，将公司信息设置为审核中状态
         MaintenanceCompany maintenanceCompany = maintenanceCompanyService.getById(companyAttestationRequest.getMtCompanyId());
         maintenanceCompany.setIsCertificated(ApiConstants.CompanyConstants.MAINTENANCE_WAIT_CERTIFICATE);
@@ -127,15 +144,34 @@ public class MtCompanyAttestationServiceImpl extends ServiceImpl<MtCompanyAttest
                 }
             }
         }
-        IPage<MtCompanyAttestation> mtCompanyAttestationPage = new Page<>(companyAttestationRequest.getPageNum(), companyAttestationRequest.getPageSize());
+        IPage mtCompanyAttestationPage = new Page<>(companyAttestationRequest.getPageNum(), companyAttestationRequest.getPageSize());
         mtCompanyAttestationPage = this.page(mtCompanyAttestationPage, new QueryWrapper<MtCompanyAttestation>()
                 .eq(currentUserId != null, "customer_manager_id", currentUserId)
-                .or()
+                //通过审核状态筛选申请信息
+                .eq("is_certificated", companyAttestationRequest.getIsCertificated())
                 .like(StringUtils.isNotBlank(companyAttestationRequest.getQueryCondition()), "contacts_name",
                         companyAttestationRequest.getQueryCondition())
+                .or()
                 .like(StringUtils.isNotBlank(companyAttestationRequest.getQueryCondition()), "contacts_tel",
                         companyAttestationRequest.getQueryCondition())
         );
+        List<CompanyAttestationResponse> companyAttestationResponseList = new ArrayList<>();
+        List<MtCompanyAttestation> mtCompanyAttestationList = mtCompanyAttestationPage.getRecords();
+        if(mtCompanyAttestationList != null && mtCompanyAttestationList.size() > 0){
+            List<Long> customerManagerIdList = ProjectUtils.getAttrList(mtCompanyAttestationList, "customerManagerId", null);
+            List<UserInfo> userInfoList = (List<UserInfo>) userInfoService.listByIds(customerManagerIdList);
+            Map<Long, UserInfo> customerManagerIdToUserInfo = ProjectUtils.attrToObjMap(userInfoList, "userId", null);
+            for(MtCompanyAttestation mtCompanyAttestation : mtCompanyAttestationList){
+                CompanyAttestationResponse companyAttestationResponse = new CompanyAttestationResponse(mtCompanyAttestation);
+                //设置客户经理名称
+                UserInfo userInfo = customerManagerIdToUserInfo.get(mtCompanyAttestation.getCustomerManagerId());
+                if(userInfo != null){
+                    companyAttestationResponse.setCustomerManagerName(userInfo.getName());
+                }
+                companyAttestationResponseList.add(companyAttestationResponse);
+            }
+            mtCompanyAttestationPage.setRecords(companyAttestationResponseList);
+        }
         return RestResponse.success(mtCompanyAttestationPage, ApiConstants.RESULT_SUCCESS, "获取公司申请信息成功");
     }
 

lift-system-service/src/main/java/cn/com/ty/lift/system/user/controller/MenuController.java

@@ -5,6 +5,7 @@ import cn.com.ty.lift.system.user.service.IMenuService;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -27,7 +28,7 @@ public class MenuController {
      * @date 2019/11/27 10:03 AM
      */
     @RequestMapping("/all")
-    public RestResponse all(MenuRequest menuRequest) {
+    public RestResponse all(@RequestBody MenuRequest menuRequest) {
         return menuService.all(menuRequest);
     }
 
@@ -38,7 +39,7 @@ public class MenuController {
      * @date 2019/11/27 10:03 AM
      */
     @RequestMapping("/list")
-    public RestResponse list(MenuRequest menuRequest) {
+    public RestResponse list(@RequestBody MenuRequest menuRequest) {
         return menuService.list(menuRequest);
     }
 

lift-system-service/src/main/java/cn/com/ty/lift/system/user/controller/RoleController.java

@@ -40,7 +40,7 @@ public class RoleController {
      * @date 2019-12-23 22:54
      */
     @RequestMapping("/companyRoleList")
-    public RestResponse companyRoleList(RoleRequest roleRequest) {
+    public RestResponse companyRoleList(@RequestBody RoleRequest roleRequest) {
         return roleService.companyRoleList(roleRequest);
     }
 

lift-system-service/src/main/java/cn/com/ty/lift/system/user/controller/UserApplicationController.java

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
  * 用户申请表 前端控制器
  * </p>
  *
- * @author wang-hai-cheng
+ * @author huangyuan
  * @since 2019-12-13
  */
 @RestController

lift-system-service/src/main/java/cn/com/ty/lift/system/user/dao/mapper/MenuMapper.java

@@ -4,8 +4,6 @@ import cn.com.ty.lift.system.user.dao.entity.Menu;
 import cn.com.xwy.boot.mybatis.MyBatisMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
-import java.util.List;
-
 /**
  * MyBatis Mapper 接口 - 表：menu
  * @since 2019-12-01 15:46:21
@@ -13,11 +11,4 @@ import java.util.List;
 @MyBatisMapper
 public interface MenuMapper extends BaseMapper<Menu> {
 
-	/**
-	 * @description 通过角色id获取菜单列表
-	 * @date 2019/11/27 10:03 AM
-	 * @param roleId 角色id
-	 * @return
-	 */
-    List<Menu> getByRoleId(Long roleId);
 }

lift-system-service/src/main/java/cn/com/ty/lift/system/user/service/IMenuService.java

@@ -14,52 +14,60 @@ import java.util.List;
  */
 public interface IMenuService extends IService<Menu> {
     /**
-     * @description 通过角色信息获取菜单列表
-     * @date 2019/11/27 10:03 AM
      * @param
      * @return
+     * @description 通过角色信息获取菜单列表
+     * @date 2019/11/27 10:03 AM
      */
     List<Menu> getByRoleId(Long roleId);
 
     /**
-     * @description 菜单列表转路径
-     * @date 2019/11/27 10:03 AM
      * @param menuList 菜单列表
      * @return
+     * @description 菜单列表转路径
+     * @date 2019/11/27 10:03 AM
      */
     String menuToUrl(List<Menu> menuList);
 
     /**
-     * @description 获取所有的菜单信息
-     * @date 2019/11/27 10:03 AM
      * @param
      * @param menuRequest
      * @return
+     * @description 获取所有的菜单信息
+     * @date 2019/11/27 10:03 AM
      */
     RestResponse all(MenuRequest menuRequest);
 
     /**
-     * @description 通过公司id获取公司菜单
-     * @date 2019/11/27 10:03 AM
      * @param
      * @return
+     * @description 通过公司id获取公司菜单
+     * @date 2019/11/27 10:03 AM
      */
     RestResponse list(MenuRequest menuRequest);
 
     /**
-     * @description 给公司分配菜单
-     * @date 2019/11/27 10:03 AM
      * @param
      * @return
+     * @description 给公司分配菜单
+     * @date 2019/11/27 10:03 AM
      */
     RestResponse companyMenu(MenuRequest menuRequest);
 
     /**
-     * @description 获取菜单树
-     * @date 2019-12-09
      * @param menuList 菜单列表
      * @return
+     * @description 获取菜单树
+     * @date 2019-12-09
      */
     List<Menu> getMenuTree(List<Menu> menuList);
 
+    /**
+     * @param
+     * @return
+     * @description 获取公司菜单列表
+     * @date 2019-12-24 17:56
+     */
+    List<Menu> getCompanyMenuList(Long companyId);
+
 }

lift-system-service/src/main/java/cn/com/ty/lift/system/user/service/impl/MenuService.java

@@ -3,12 +3,14 @@ package cn.com.ty.lift.system.user.service.impl;
 import cn.com.ty.lift.common.constants.ApiConstants;
 import cn.com.ty.lift.system.user.dao.entity.CompanyMenu;
 import cn.com.ty.lift.system.user.dao.entity.Menu;
+import cn.com.ty.lift.system.user.dao.entity.RoleMenu;
 import cn.com.ty.lift.system.user.dao.entity.model.MenuRequest;
 import cn.com.ty.lift.system.user.dao.mapper.MenuMapper;
 import cn.com.ty.lift.system.user.service.ICompanyMenuService;
 import cn.com.ty.lift.system.user.service.IMenuService;
 import cn.com.ty.lift.common.utils.TreeUtil;
 import cn.com.ty.lift.common.utils.ProjectUtils;
+import cn.com.ty.lift.system.user.service.IRoleMenuService;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -28,15 +30,20 @@ import java.util.List;
 @Service
 public class MenuService extends ServiceImpl<MenuMapper, Menu> implements IMenuService {
 
-    @Autowired
-    private MenuMapper menuMapper;
 
     @Autowired
     private ICompanyMenuService companyMenuService;
 
+    @Autowired
+    private IRoleMenuService roleMenuService;
+
     @Override
     public List<Menu> getByRoleId(Long roleId) {
-        return menuMapper.getByRoleId(roleId);
+        List<RoleMenu> roleMenuList = roleMenuService.list(new QueryWrapper<RoleMenu>()
+                .eq("role_id", roleId)
+        );
+        List<Long> menuIdList = ProjectUtils.getAttrList(roleMenuList, "menuId", null);
+        return (List<Menu>) this.listByIds(menuIdList);
     }
 
     @Override
@@ -52,9 +59,9 @@ public class MenuService extends ServiceImpl<MenuMapper, Menu> implements IMenuS
     @Override
     public RestResponse all(MenuRequest menuRequest) {
         List<Menu> allMenus = this.list();
-        if(menuRequest.getCompanyId() != null){
+        if (menuRequest.getCompanyId() != null) {
             //如果公司id不为空，获取当前公司已有的菜单信息
-            List<Menu> companyMenus = this.list(new QueryWrapper<Menu>().eq("company_id", menuRequest.getCompanyId()));
+            List<Menu> companyMenus = this.getCompanyMenuList(menuRequest.getCompanyId());
             //在全部订单中设置选中
             setMenuChecked(allMenus, companyMenus);
         }
@@ -64,8 +71,8 @@ public class MenuService extends ServiceImpl<MenuMapper, Menu> implements IMenuS
 
     @Override
     public RestResponse list(MenuRequest menuRequest) {
-        List<Menu> menuList = this.list(new QueryWrapper<Menu>().eq("company_id", menuRequest.getCompanyId()));
-        if(menuRequest.getRoleId() != null){
+        List<Menu> menuList = this.getCompanyMenuList(menuRequest.getCompanyId());
+        if (menuRequest.getRoleId() != null) {
             //如果传递了角色，获取角色下的所有菜单
             List<Menu> roleMenuList = getByRoleId(menuRequest.getRoleId());
             //设置角色有的菜单为选中
@@ -74,6 +81,15 @@ public class MenuService extends ServiceImpl<MenuMapper, Menu> implements IMenuS
         return RestResponse.success(getMenuTree(menuList), ApiConstants.RESULT_SUCCESS, "获取企业所有菜单信息");
     }
 
+    @Override
+    public List<Menu> getCompanyMenuList(Long companyId) {
+        List<CompanyMenu> companyMenuList = companyMenuService.list(new QueryWrapper<CompanyMenu>()
+                .eq("company_id", companyId)
+        );
+        List<Long> menuIdList = ProjectUtils.getAttrList(companyMenuList, "menuId", null);
+        return (List<Menu>) this.listByIds(menuIdList);
+    }
+
     @Override
     @Transactional
     public RestResponse companyMenu(MenuRequest menuRequest) {
@@ -83,7 +99,9 @@ public class MenuService extends ServiceImpl<MenuMapper, Menu> implements IMenuS
                 .eq("company_id", companyId)
         );
         List<Long> companyMenuIds = ProjectUtils.getAttrList(needDeleteCompanyMenuList, "id", null);
-        companyMenuService.removeByIds(companyMenuIds);
+        if (companyMenuIds != null && companyMenuIds.size() > 0) {
+            companyMenuService.removeByIds(companyMenuIds);
+        }
         //获取菜单id列表
         List<Long> menuIdList = ProjectUtils.getLongIdFromIds(menuRequest.getMenuIds());
         List<CompanyMenu> needSaveCompanyMenuList = new ArrayList<>();

lift-system-service/src/main/java/cn/com/ty/lift/system/user/service/impl/MtCompanyUserService.java

@@ -48,20 +48,18 @@ public class MtCompanyUserService extends ServiceImpl<MtCompanyUserMapper, MtCom
     @Transactional
     public RestResponse assignRole(MtCompanyUserRequest mtCompanyUserRequest) {
         //获取用户是否已有mtCompanyUser信息。
-        MtCompanyUser mtCompanyUser = this.getOne(new QueryWrapper<MtCompanyUser>()
-                .eq("mt_company_id", mtCompanyUserRequest.getCompanyId())
-                .eq("user_id", mtCompanyUserRequest.getUserId())
-        );
-        if (mtCompanyUser == null) {
-            mtCompanyUser = new MtCompanyUser(mtCompanyUserRequest);
-            mtCompanyUser.setMtCompanyId(mtCompanyUserRequest.getCompanyId());
-        }
+        MtCompanyUser mtCompanyUser = this.getById(mtCompanyUserRequest.getId());
         //保存职业信息
-        this.saveOrUpdate(mtCompanyUser);
+        mtCompanyUser.setJob(mtCompanyUserRequest.getJob());
+        this.updateById(mtCompanyUser);
         //保存用户角色关联信息
         //1.删除原有的关联关系
-        UserRole queryUserRole = new UserRole(mtCompanyUserRequest.getUserId(), mtCompanyUserRequest.getRoleId());
-        UserRole userRole = userRoleService.getByUserRole(queryUserRole);
+        Long roleId = mtCompanyUserRequest.getRoleId();
+        Long userId = mtCompanyUser.getUserId();
+        UserRole userRole = userRoleService.getOne(new QueryWrapper<UserRole>()
+                .eq("role_id", roleId)
+                .eq("user_id", userId)
+        );
         if (userRole != null) {
             boolean deleteUserRoleFlag = userRoleService.removeById(userRole.getId());
             if (!deleteUserRoleFlag) {
@@ -70,9 +68,9 @@ public class MtCompanyUserService extends ServiceImpl<MtCompanyUserMapper, MtCom
         }
         //2.保存新的关联关系
         userRole = new UserRole();
-        userRole.setCompanyId(mtCompanyUserRequest.getCompanyId());
-        userRole.setRoleId(mtCompanyUserRequest.getRoleId());
-        userRole.setUserId(mtCompanyUserRequest.getUserId());
+        userRole.setCompanyId(mtCompanyUser.getMtCompanyId());
+        userRole.setRoleId(roleId);
+        userRole.setUserId(userId);
         userRoleService.save(userRole);
         return RestResponse.success(null, ApiConstants.RESULT_SUCCESS, "分配角色成功");
     }
@@ -150,7 +148,7 @@ public class MtCompanyUserService extends ServiceImpl<MtCompanyUserMapper, MtCom
         IPage mtCompanyUserPage = new Page(mtCompanyUserRequest.getPageNum(), mtCompanyUserRequest.getPageSize());
         mtCompanyUserPage = this.page(mtCompanyUserPage, new QueryWrapper<MtCompanyUser>()
                 //判断用户是否在符合查询条件的用户列表中
-                .in(userQueryIdList != null && userQueryIdList.size() > 0, "userId", userQueryIdList)
+                .in(userQueryIdList != null && userQueryIdList.size() > 0, "user_id", userQueryIdList)
                 .eq("mt_company_id", mtCompanyUserRequest.getCompanyId())
                 //获取在团队中的用户
                 .eq("status", ApiConstants.ApplicationConstants.COMPANY_USER_PASS)
@@ -202,7 +200,7 @@ public class MtCompanyUserService extends ServiceImpl<MtCompanyUserMapper, MtCom
         }
         //分页数据更换
         mtCompanyUserPage.setRecords(mtCompanyUserResponseList);
-        return RestResponse.success(mtCompanyUserResponseList, ApiConstants.RESULT_SUCCESS, "获取公司成员列表成功");
+        return RestResponse.success(mtCompanyUserPage, ApiConstants.RESULT_SUCCESS, "获取公司成员列表成功");
     }
 
 }

lift-system-service/src/main/java/cn/com/ty/lift/system/user/service/impl/RoleService.java

@@ -162,7 +162,7 @@ public class RoleService extends ServiceImpl<RoleMapper, Role> implements IRoleS
     @Override
     public Map<Long, Role> getUserIdToRoleByUserIdsAndCompanyId(List<Long> userIdList, Long companyId) {
         Map<Long, Role> userIdToRole = new HashMap<>();
-        if(userIdList != null && userIdList.size() > 0){
+        if (userIdList != null && userIdList.size() > 0) {
             List<UserRole> userRoleList = userRoleService.list(new QueryWrapper<UserRole>()
                     .in("user_id", userIdList)
                     .eq("company_id", companyId)
@@ -173,9 +173,9 @@ public class RoleService extends ServiceImpl<RoleMapper, Role> implements IRoleS
             List<Long> roleIdList = ProjectUtils.getAttrList(userRoleList, "roleId", null);
             List<Role> roleList = (List<Role>) this.listByIds(roleIdList);
             Map<Long, Role> idToRole = ProjectUtils.attrToObjMap(roleList, "id", null);
-            for(Long userId: userIdList){
+            for (Long userId : userIdList) {
                 UserRole userRole = userIdToUserRole.get(userId);
-                if(userRole != null){
+                if (userRole != null) {
                     Role role = idToRole.get(userRole.getRoleId());
                     userIdToRole.put(userId, role);
                 }
@@ -190,7 +190,7 @@ public class RoleService extends ServiceImpl<RoleMapper, Role> implements IRoleS
         RoleResponse roleResponse = new RoleResponse();
         //获取角色
         Role role = this.getById(roleId);
-        if(role != null){
+        if (role != null) {
             //角色基础信息查看
             roleResponse.setId(roleId);
             roleResponse.setName(role.getName());
@@ -205,7 +205,9 @@ public class RoleService extends ServiceImpl<RoleMapper, Role> implements IRoleS
     @Override
     public RestResponse companyRoleList(RoleRequest roleRequest) {
         List<Role> roleList = this.list(new QueryWrapper<Role>()
-        .eq("company_id", roleRequest.getCompanyId()));
+                .eq("company_id", roleRequest.getCompanyId())
+                .eq("delete_flag", ApiConstants.DELETE_NO)
+        );
         return RestResponse.success(roleList, ApiConstants.RESULT_SUCCESS, "获取角色信息成功");
     }
 }

lift-system-service/src/main/java/cn/com/ty/lift/system/user/service/impl/UserApplicationService.java

@@ -53,7 +53,7 @@ public class UserApplicationService extends ServiceImpl<UserApplicationMapper, U
     public RestResponse applyTeam(UserApplyRequest userApplyRequest) {
         //获取用户原有的申请信息
         UserApplication userApplication = this.getOne(new QueryWrapper<UserApplication>()
-                .eq("company_id", userApplyRequest.getCompanyId())
+                .eq("mt_company_id", userApplyRequest.getCompanyId())
                 .eq("user_id", userApplyRequest.getUserId())
         );
         if (userApplication != null) {
@@ -75,6 +75,7 @@ public class UserApplicationService extends ServiceImpl<UserApplicationMapper, U
         }
         //审核状态变为待审核
         userApplication.setStatus(ApiConstants.ApplicationConstants.COMPANY_USER_WAIT);
+        this.saveOrUpdate(userApplication);
         return RestResponse.success(null, ApiConstants.RESULT_SUCCESS, "申请成功");
     }
 
@@ -142,7 +143,7 @@ public class UserApplicationService extends ServiceImpl<UserApplicationMapper, U
         List<UserApplyResponse> userApplyResponseList = new ArrayList<>();
         IPage userApplicationPage = new Page(userApplyRequest.getPageNum(), userApplyRequest.getPageSize());
         userApplicationPage = this.page(userApplicationPage, new QueryWrapper<UserApplication>()
-                .in("user_id", userQueryIdList)
+                .in(userQueryIdList != null && userQueryIdList.size() > 0, "user_id", userQueryIdList)
                 .eq("mt_company_id", userApplyRequest.getCompanyId())
                 .eq("status", userApplyRequest.getStatus())
         );

lift-system-service/src/main/resources/mapper/MenuMapper.xml

@@ -16,14 +16,5 @@
 		id, parent_id, name, code, url, type, default_flag, description
 	</sql>
 
-	<!-- 通过角色信息获取菜单列表 -->
-	<select id="getByRoleId" parameterType="java.lang.Long" resultType="cn.com.ty.lift.system.user.dao.entity.Menu">
-		select
-		<include refid="Base_Column_List"></include>
-		from menu
-		where id in (
-		select menu_id from role_menu
-		where role_id = #{roleId,jdbcType=BIGINT})
-	</select>
 
 </mapper>