Merge branch 'master' of http://192.168.60.201/root/dsk-operate-sys

dsk-admin/src/main/java/com/dsk/web/controller/business/BusinessFileController.java

@@ -89,8 +89,7 @@ public class BusinessFileController extends BaseController {
     @PostMapping("/upload")
     public AjaxResult uploadFolder(@RequestPart("file") MultipartFile file,HttpServletRequest request){
         try {
-//            String businessFileName = request.getHeader("FilePath");
-            String businessFileName = "10";
+            String businessFileName = request.getHeader("FilePath");
         // 上传文件路径
         String filePath = RuoYiConfig.getUploadPath()+businessFileName+"/";
         // 上传并返回文件全路径

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseUipSearchBody.java

@@ -41,6 +41,11 @@ public class EnterpriseUipSearchBody extends BasePage {
      */
     private List<Integer> areaIds;
 
+    /**
+     * 行政级别
+     */
+    private List<String> uipExecutiveLevel;
+
     /**
      * 城投业务类型
      */

dsk-framework/src/main/java/com/dsk/framework/config/SecurityConfig.java

 package com.dsk.framework.config;
 
 import com.dsk.framework.config.properties.PermitAllUrlProperties;
+import com.dsk.framework.security.filter.JwtAuthenticationTokenFilter;
+import com.dsk.framework.security.handle.AuthenticationEntryPointImpl;
+import com.dsk.framework.security.handle.LogoutSuccessHandlerImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.http.HttpMethod;
@@ -16,9 +19,6 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 import org.springframework.security.web.authentication.logout.LogoutFilter;
 import org.springframework.web.filter.CorsFilter;
-import com.dsk.framework.security.filter.JwtAuthenticationTokenFilter;
-import com.dsk.framework.security.handle.AuthenticationEntryPointImpl;
-import com.dsk.framework.security.handle.LogoutSuccessHandlerImpl;
 
 /**
  * spring security配置
@@ -115,6 +115,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 // 静态资源，可匿名访问
                 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
                 .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()
+//                .antMatchers("/business/**").permitAll()
                 // 除上面外的所有请求全部需要鉴权认证
                 .anyRequest().authenticated()
                 .and()

dsk-operate-ui/src/views/project/projectList/index.vue

@@ -113,12 +113,12 @@
       </div>
       <div class="datalist">
         <div class="datali" v-for="(item,index) in datalist">
-          <div class="det-title" @click="toDetail(item.id)">{{item.projectName}}<span v-if="activeName!='first'" class="people"><i>{{item.nickName1}}</i>{{item.nickName}}  <font color="#FA8A00" v-if="activeName!='first'">正在跟进</font></span></div>
+          <div class="det-title" @click="toDetail(item.id)">{{item.projectName}}<span v-if="activeName!='first' && item.followTime" class="people"><i>{{item.nickName1}}</i>{{item.nickName}}  <font color="#FA8A00">正在跟进</font></span></div>
           <div class="det-tips"><span class="tips tip1" v-if="item.label">{{item.label}}</span><span v-if="item.address" class="tips tip2">{{item.address}}</span></div>
           <div class="det-contets">
             <div class="det-con">
               <span>项目类型：</span>
-              <span>轨道交通</span>
+              <span>{{item.projectType}}</span>
             </div>
             <div class="det-con">
               <span>投资估算（万元）：</span>