优化

src/main/java/com/bootdo/datas/service/impl/GyDataServiceImpl.java

@@ -240,19 +240,26 @@ public class GyDataServiceImpl implements GyDataService {
         // 用户信息
         UserDO currUser = ShiroUtils.getUser();
         log.info("currUser:" + currUser.toString());
-
+        if(null == currUser){
+            throw new BDException("当前用户没登录");
+        }
         String userProvince = null;
         String userCity= null;
-        if (null != currUser) {
+
+        if (managerValue.contains(currUser.getDeptId().toString())) {
+            userProvince = sysProvince;
+            userCity = sysCity;
+        } else {
             userProvince = currUser.getProvince();
-            if(StringUtils.isNotEmpty(userProvince)){
+            if(StringUtils.isEmpty(userProvince)){
                 userProvince = sysProvince;
             }
             userCity = currUser.getCity();
-            if(StringUtils.isNotEmpty(userCity)){
+            if(StringUtils.isEmpty(userCity)){
                 userCity = sysCity;
             }
         }
+
         //判断是哪种格式的
         Row firstRow = xssfSheet.getRow(0);
         Cell firstRowCell = firstRow.getCell(0);

src/main/resources/mybatis/datas/GyUnitMapper.xml

@@ -3,7 +3,8 @@
 
 <mapper namespace="com.bootdo.datas.dao.GyUnitDao">
     <select id="getGyUnitByCreditCode" resultType="com.bootdo.datas.domain.GyUnitDO">
-        a.ID as id,
+        SELECT
+            a.ID as id,
             a.REPORTER_UNIT as reporterUnit,
             a.CREDIT_CODE as creditCode,
             a.UNIT_CHARACTER as unitCharacter,
@@ -21,6 +22,7 @@
             a.UPDATE_TIME as updateTime,
             a.audit_status as auditStatus
         from gy_unit a
+            where
             a.STATUS = '0' and a.CREDIT_CODE = #{creditCode}
     </select>
     <select id="getGyUnit" resultType="java.lang.Integer">

src/main/resources/static/js/appjs/datas/dataSendProvince/data.js

@@ -270,8 +270,8 @@ function encryptExports() {
     });
 }
 
-//上报到省级 sendBatch
-function sendBatch() {
+//上报到省级 sendProvince
+function sendProvince() {
     var rows = $('#exampleTable').bootstrapTable('getSelections'); // 返回所有选择的行，当没有选择的记录时，返回一个空数组
     if (rows.length == 0) {
         layer.msg("请选择要上报到省级的备案数据");
@@ -291,7 +291,7 @@ function sendBatch() {
             data: {
                 "ids": ids
             },
-            url: prefix + '/sendVerify',
+            url: prefix + '/sendProvince',
             success: function (r) {
                 if (r.code == 0) {
                     layer.msg(r.msg);

src/main/resources/static/js/appjs/datas/unionVerify/data.js

@@ -6,7 +6,7 @@ var selected = "#333";
 $(function () {
     $("#unitProvince").val('');
     //初始化 默认审核中
-    //$('#status').val('2');
+   //$('#status').val('2');
     load();
     //数据级别
     loadLevel();

src/main/resources/templates/datas/dataSendProvince/data.html

@@ -9,10 +9,6 @@
             <div class="ibox-body">
                 <div class="form-inline m-t" role="form" >
                     <div class="form-group">
-<!--                        <select data-placeholder="&#45;&#45;审核阶段&#45;&#45;" name="auditStage" id="auditStage"-->
-<!--                                style="width: 130px;"  class="form-control chosen-select-auditStage" tabindex="2" required >-->
-<!--                            <option value="">&#45;&#45;审核阶段&#45;&#45;</option>-->
-<!--                        </select>-->
 
                         <select data-placeholder="--选择行业--" name="industryTypeOne" id="industryTypeOne"
                                 class="form-control chosen-select-industryType" tabindex="2" required
@@ -23,7 +19,9 @@
                                 style="width: 130px;"   class="form-control chosen-select-level" tabindex="2" required >
                             <option value="">--数据级别--</option>
                         </select>
-                        <select  data-placeholder="--选择城市--" name="unitCity" id="unitCity"
+
+
+                        <select shiro:hasPermission="datas:data:city" data-placeholder="--选择城市--" name="unitCity" id="unitCity"
                                 style="width: 130px;" class="form-control chosen-select-city" tabindex="2" required>
                             <option value="">--选择城市--</option>
                         </select>
@@ -59,7 +57,7 @@
                         </button>
 
                         <button shiro:hasPermission="datas:dataSendProvince:sendProvince" type="button" class="btn  btn-primary"
-                                onclick="sendBatch()">
+                                onclick="sendProvince()">
                             <i class="fa fa-share" aria-hidden="true"></i> 上报到省级
                         </button>
 

src/main/resources/templates/datas/dataSendProvince/edit.html

@@ -10,17 +10,9 @@
                 <div class="ibox-content">
                     <form class="form-horizontal m-t" id="signupForm">
                         <div th:include="commonDatas::datas"></div>
-                        <div class="form-group">
-                            <label class="col-sm-3 control-label">上传时间：</label>
-                            <div class="col-sm-8">
-                                <input readonly id="uploadTime" name="uploadTime"
-                                       th:value="${#dates.format(data.uploadTime,'yyyy-MM-dd HH:mm:ss')}"
-                                       class="form-control" type="text">
-                            </div>
-                        </div>
                     </form>
                     <div style="text-align: center">
-                        <button type="button" class="btn btn-primary" id="go_back" onclick="closeTheDiv()">返回</button>
+                        <button type="submit" class="btn btn-primary" id="go_back">返回</button>
                     </div>
                 </div>
             </div>
@@ -28,15 +20,7 @@
     </div>
 </div>
 <div th:include="include::footer"></div>
-<script type="text/javascript" src="/js/appjs/datas/dataSendProvince/edit.js">
-</script>
-
-<script type="text/javascript">
-    //返回
-    function closeTheDiv() {
-        let index = parent.layer.getFrameIndex(window.name); // 获取窗口索引
-        parent.layer.close(index);
-    }
-</script>
+<script type="text/javascript" src="/js/appjs/datas/dataSendProvince/edit.js"></script>
+<script type="text/javascript" src="/js/appjs/datas/selected.js"></script>
 </body>
 </html>