Merge branch 'wanghaicheng' of lift-manager/lift-server into develop

lift-common/src/main/java/cn.com.ty.lift.common/constants/SqlConstants.java

@@ -147,6 +147,7 @@ public interface SqlConstants {
                     "     , r.province_code provinceCode" +
                     "     , r.clerk         clerk" +
                     "     , r.mt_company_id mtCompanyId" +
+                    "     , r.user_id       userId" +
                     "     , ui.name         name" +
                     "     , r.id            id" +
                     "   from region r" +

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/region/dao/entity/model/RegionResponse.java

@@ -12,6 +12,7 @@ public class RegionResponse {
     private String provinceCode;
     private String clerk;
     private Long mtCompanyId;
+    private Long userId;
     private String name;
     private String provinceName;
     private String cityName;

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/region/service/impl/RegionServiceImpl.java

@@ -18,6 +18,7 @@ import org.springframework.jms.core.JmsMessagingTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -181,10 +182,13 @@ public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> impleme
     @Transactional(rollbackFor = Exception.class)
     public RestResponse<?> updateByRegionId(Region region) {
         Region byId = this.getById(region);
+        region.setUpdateTime(LocalDateTime.now());
         //如果区域主管更改了，发推送消息，修改project_user表内的区域主管信息
         if (!byId.getUserId().equals(region.getUserId())) {
             List<Long> projects = baseMapper.selectProjectIdByRegionDirectorId(byId.getUserId(), byId.getMtCompanyId());
-            baseMapper.updateRegionDirector(projects, region.getUserId(), byId.getMtCompanyId());
+            if (projects != null && projects.size() > 0) {
+                baseMapper.updateRegionDirector(projects, region.getUserId(), byId.getMtCompanyId());
+            }
             String oldUser = baseMapper.selectNameByUserId(byId.getUserId());
             String newUser = baseMapper.selectNameByUserId(region.getUserId());
             String areaName = byId.getAreaName();

lift-system-service/src/main/resources/application.yml

@@ -12,7 +12,7 @@ spring:
   application:
     name: lift-system-service
   profiles:
-    active: web
+    active: prod
 
 #自动添加createTime、isDelete 等字段
 xwy: