Merge branch 'develop' of http://132.232.206.88:3000/lift-manager/lift-server into wanghaicheng

lift-business-service/src/main/resources/logback-spring.xml

@@ -6,7 +6,7 @@
 
     <property name="PROJECT" value="lift-business" />
     <property name="ROOT" value="logs/${PROJECT}/" />
-    <property name="FILESIZE" value="50MB" />
+    <property name="FILESIZE" value="10MB" />
     <property name="MAXHISTORY" value="100" />
     <timestamp key="DATETIME" datePattern="yyyy-MM-dd HH:mm:ss" />
     <!-- 控制台打印 -->

lift-business-service/src/main/resources/mapper/emergency/EmergencyRepairMapper.xml

@@ -67,7 +67,7 @@
     </select>
 
     <!--根据条件查询急修记录总条数-->
-    <select id="countByCondition" resultMap="BaseResultMap" parameterType="cn.com.ty.lift.business.emergency.dto.RepairRequest" >
+    <select id="countByCondition" resultType="java.lang.Long" parameterType="cn.com.ty.lift.business.emergency.dto.RepairRequest" >
         SELECT
         count(*)
         FROM

lift-enterprise-service/src/main/resources/logback-spring.xml

@@ -6,7 +6,7 @@
 
     <property name="PROJECT" value="lift-enterprise" />
     <property name="ROOT" value="logs/${PROJECT}/" />
-    <property name="FILESIZE" value="50MB" />
+    <property name="FILESIZE" value="10MB" />
     <property name="MAXHISTORY" value="100" />
     <timestamp key="DATETIME" datePattern="yyyy-MM-dd HH:mm:ss" />
     <!-- 控制台打印 -->

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

@@ -84,11 +84,14 @@ public class MtCompanyUserService extends ServiceImpl<MtCompanyUserMapper, MtCom
         //如果角色编码不为空，则是获取指定公司指定角色的信息，如果角色编码为空则是获取所有成员信息
         if (StringUtils.isNotBlank(mtCompanyUserRequest.getRoleCode())) {
             Role role = roleService.getOne(new QueryWrapper<Role>()
+                    .eq("code", mtCompanyUserRequest.getRoleCode())
                     .eq("company_id", mtCompanyUserRequest.getCompanyId())
             );
             //如果角色不存在则无用户可以获取
-            if (role != null) {
+            if (role == null) {
                 roleId = -1L;
+            } else {
+                roleId = role.getId();
             }
         }
         //获取公司下角色信息关联信息
@@ -99,18 +102,20 @@ public class MtCompanyUserService extends ServiceImpl<MtCompanyUserMapper, MtCom
         //获取角色关联的用户信息
         List<Long> userIdList = ProjectUtils.getAttrList(userRoleList, "userId", null);
         //获取用户信息集合
-        List<UserInfo> userInfoList = (List<UserInfo>) userInfoService.listByIds(userIdList);
-        Map<Long, UserInfo> userIdToUserInfo = ProjectUtils.attrToObjMap(userInfoList, "userId", null);
-        if (userIdToUserInfo != null && userIdToUserInfo.size() > 0) {
-            for (Long userId : userIdList) {
-                //封装用户信息
-                UserResponse userResponse = new UserResponse();
-                userResponse.setUserId(userId);
-                UserInfo userInfo = userIdToUserInfo.get(userId);
-                if (userInfo != null) {
-                    userResponse.setName(userInfo.getName());
+        if(userIdList != null && userIdList.size() > 0){
+            List<UserInfo> userInfoList = (List<UserInfo>) userInfoService.listByIds(userIdList);
+            Map<Long, UserInfo> userIdToUserInfo = ProjectUtils.attrToObjMap(userInfoList, "userId", null);
+            if (userIdToUserInfo != null && userIdToUserInfo.size() > 0) {
+                for (Long userId : userIdList) {
+                    //封装用户信息
+                    UserResponse userResponse = new UserResponse();
+                    userResponse.setUserId(userId);
+                    UserInfo userInfo = userIdToUserInfo.get(userId);
+                    if (userInfo != null) {
+                        userResponse.setName(userInfo.getName());
+                    }
+                    userResponseList.add(userResponse);
                 }
-                userResponseList.add(userResponse);
             }
         }
         return RestResponse.ok(userResponseList, ApiConstants.RESULT_SUCCESS, "获取团队用户成功");