Merge remote-tracking branch 'origin/master'

src/main/java/com/yunfeiyun/agmp/fms/controller/FmsConsoleController.java

@@ -99,7 +99,7 @@ public class FmsConsoleController {
         Map<String, Object> resultMap = new HashMap<>();
 
         try {
-            JSONObject resultObj = weatherService.getProjectWeather();
+            JSONObject resultObj = weatherService.getProjectWeather("7");
             String city = resultObj.getString("city");
             String province = resultObj.getString("province");
             String district = resultObj.getString("district");

src/main/java/com/yunfeiyun/agmp/fms/service/impl/FmsExpertServiceImpl.java

@@ -1,7 +1,5 @@
 package com.yunfeiyun.agmp.fms.service.impl;
 
-import java.util.List;
-
 import com.yunfeiyun.agmp.common.framework.manager.ResManager;
 import com.yunfeiyun.agmp.common.utils.SecurityUtils;
 import com.yunfeiyun.agmp.common.utils.StringUtils;
@@ -15,7 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
+import java.util.List;
 
 
 /**
@@ -81,6 +79,7 @@ public class FmsExpertServiceImpl implements IFmsExpertService {
             resManager.deleteRes(new String[]{fmsExpert.getExpertId()});
             resManager.updateRes(fmsExpert.getResId(), fmsExpert.getExpertId());
         }
+        fmsExpert.setTid(SecurityUtils.getTid());
         return fmsExpertMapper.updateFmsExpert(fmsExpert);
     }