Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev

epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java

@@ -486,7 +486,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol
         dto.setMobile(formDTO.getMobile());
         Result<List<CustomerStaffDTO>> customerStaffResult = epmetUserOpenFeignClient.getCustsomerStaffByIdAndPhone(dto);
         if (!customerStaffResult.success()) {
-            logger.error(String.format("手机密码登录异常,手机号[%s],code[%s],msg[%s]", formDTO.getMobile(), customerStaffResult.getCode(), customerStaffResult.getMsg()));
+            logger.warn(String.format("手机密码登录异常,手机号[%s],code[%s],msg[%s]", formDTO.getMobile(), customerStaffResult.getCode(), customerStaffResult.getMsg()));
             throw new RenException(customerStaffResult.getCode());
         }
         //2、密码是否正确
@@ -529,7 +529,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol
         if(result.success()&&null!=result.getData()){
             return result.getData();
         }
-        logger.error(String .format("手机验证码获取组织,调用%s服务失败,入参手机号%s,密码%s,返回错误码%s,错误提示信息%s",
+        logger.warn(String .format("手机验证码获取组织,调用%s服务失败,入参手机号%s,密码%s,返回错误码%s,错误提示信息%s",
                 ServiceConstant.GOV_ORG_SERVER,
                 formDTO.getMobile(),
                 formDTO.getPassword(),

epmet-user/epmet-user-server/src/main/resources/mapper/StaffPatrolRecordDao.xml

@@ -22,7 +22,7 @@
                     pr.STAFF_ID = #{userId}
                 </foreach>
                 )
-        GROUP BY pr.STAFF_ID ORDER BY pr.CREATED_TIME DESC)t
+        ORDER BY pr.CREATED_TIME DESC)t GROUP BY STAFF_ID
     </select>
 
     <!-- 巡查记录查询 -->