Merge branch 'dev' into dev-2.0

data-ui/src/views/data/common/ISuperMap.vue

@@ -78,10 +78,8 @@
       },
       init(sign, form,NB,type) {
         const regex = /^\d+(\.\d+)?$/;
-        if (this.$parent.form.latitude == null||this.$parent.form.longitude == null) {
-
-        }else{
-          if (!regex.test(form.longitude) && !regex.test(form.latitude)) {
+        if (this.$parent.form.longitude != null) {
+          if (!regex.test(form.longitude) ) {
             this.$message.warning('无效字符');
             this.visible = false;
             this.$parent.ISuperMapvisible = false;
@@ -89,6 +87,15 @@
             this.$parent.form.longitude = null;
           }
         }
+        if (this.$parent.form.latitude != null) {
+          if (!regex.test(form.latitude)) {
+            this.$message.warning('无效字符');
+            this.visible = false;
+            this.$parent.ISuperMapvisible = false;
+            this.$parent.form.latitude = null;
+            this.$parent.form.longitude  = null;
+          }
+        }
         if(NB=='NB'){
           getConfigKey('supermapKey').then(response => {
             let isN = response.msg;

src/main/java/com/sooka/sponest/data/commandcenter/service/impl/ICommandCenterServiceImpl.java

@@ -189,6 +189,7 @@ public class ICommandCenterServiceImpl extends BaseServiceImpl implements IComma
      * @param commandCenterBO
      * @return
      */
+    @DataScopeMutiDept(deptAlias = "d")
     @Override
     public List<AreaBody> getImportAreaList(CommandCenterBO commandCenterBO) {
         setSookaDataBase(commandCenterBO);
@@ -222,6 +223,7 @@ public class ICommandCenterServiceImpl extends BaseServiceImpl implements IComma
      * @param commandCenterBO
      * @return
      */
+    @DataScopeMutiDept(deptAlias = "d")
     @Override
     public List<Map<String, Object>> getImportAreaListPage(CommandCenterBO commandCenterBO) {
         setSookaDataBase(commandCenterBO);

src/main/java/com/sooka/sponest/data/utils/ScheduleAtachUtil.java

@@ -72,7 +72,7 @@ public class ScheduleAtachUtil {
     }
 
     //每周的周日晚上8点开始运行
-    @Scheduled(cron = "* * 20 ? * 1")
+    @Scheduled(cron = "0 0 20 ? * 1")
     @GetMapping("/urlToMultipartFile")
     public void urlToMultipartFile() throws Exception {
         logger.info("执行定时任务大华图片本地上传开始=>{}", DateUtils.dateTimeNow());

src/main/resources/mapper/commandcenter/CommandCentreMapper.xml

@@ -210,9 +210,10 @@
         FROM centerdata_t_forest_importarea a
         LEFT JOIN ${database_system}.sys_dept d on d.dept_id = a.dept_id
         <where>
-            <if test="deptId != null and deptId != ''">
-                AND FIND_IN_SET( #{deptId}, CONCAT(d.ancestors,',',d.dept_id) )
-            </if>
+            <choose>
+                <when test="deptId != null and deptId != ''">AND FIND_IN_SET( #{deptId}, CONCAT(d.ancestors,',',d.dept_id) )</when>
+                <otherwise>${params.dataScope}</otherwise>
+            </choose>
             <if test="params.areaName != null and params.areaName != ''">
                 AND a.area_name like concat('%', #{params.areaName}, '%')
             </if>