Merge remote-tracking branch 'origin/master'

src/main/java/com/care/bms/service/BmsSysUserService.java

@@ -51,17 +51,20 @@ public class BmsSysUserService{
 
     public UserLogindConvertVO getLoginUser(String orgCode, String phone,String password) {
         UserLogindConvertVO userLogindConvertVO = null;
-        QueryWrapper<CareOrganization>  organizationQueryWrapper = new QueryWrapper<>();
+        /*QueryWrapper<CareOrganization>  organizationQueryWrapper = new QueryWrapper<>();
         organizationQueryWrapper.lambda().eq(CareOrganization::getOrgCode,orgCode);
         CareOrganization org = this.careOrganizationService.getOne(organizationQueryWrapper);
         if (org == null){
             return null;
-        }
+        }*/
         QueryWrapper<CareSysUser>  userQueryWrapper = new QueryWrapper<>();
-        userQueryWrapper.lambda().eq(CareSysUser::getOrgId,org.getId())
+        userQueryWrapper.lambda() //.eq(CareSysUser::getOrgId,org.getId())
                                 .eq(CareSysUser::getPhone,phone);
         CareSysUser user = this.careSysUserService.getOne(userQueryWrapper);
         if (user != null){
+            CareOrganization org =  careOrganizationService.getById(user.getOrgId());
+
+
             userLogindConvertVO = new UserLogindConvertVO();
             BeanUtil.copyProperties(user,userLogindConvertVO);
             userLogindConvertVO.setOrgName(org.getName());

src/main/java/com/care/common/mapper/CareDeviceMapper.java

@@ -28,8 +28,9 @@ public interface CareDeviceMapper extends BaseMapper<CareDevice> {
                               @Param("houseAddr") String houseAddr,
                               @Param("chambId") Long chambId,
                               @Param("memberId") Long memberId,
-                              @Param("userStationId") Long userStationId,
-                              @Param("userOrgId") Long userOrgId);
+							  @Param("userOrgId") Long userOrgId,
+                              @Param("userStationId") Long userStationId
+                              );
 
     void updateDevChamb(@Param("id") Long id);
 }

src/main/java/com/care/outcall/schedule/KoalaOutCallBillSchedule.java

@@ -34,7 +34,7 @@ public class KoalaOutCallBillSchedule {
     /**
      * 10 秒钟调用一次
      */
-    @Scheduled(cron = "0/10 * * * * ?")
+    //@Scheduled(cron = "0/10 * * * * ?")
     public void exePhoneBill() {
         try {
             //构建话单
@@ -45,7 +45,7 @@ public class KoalaOutCallBillSchedule {
     }
 
 
-    @Scheduled(cron = "0 0 0 * * ?")
+    //@Scheduled(cron = "0 0 0 * * ?")
     public void updateComputeTrafficToFinish() {
         try {
             //大于两天的话单日志默认已计算