根据用户名称查询

gis_admin/src/main/java/com/gis/admin/entity/dto/UserDto.java

@@ -36,6 +36,9 @@ public class UserDto {
     @ApiModelProperty(value = "电话")
     private String phone;
 
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
 //    @ApiModelProperty(value = "单位")
 //    private String unit;
 

gis_admin/src/main/java/com/gis/admin/entity/po/SysUserEntity.java

@@ -59,6 +59,9 @@ public class SysUserEntity extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "部门")
     private String dept;
 
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
 
     //    @JSONField(serialize = false)
     @Transient

gis_admin/src/main/java/com/gis/admin/mapper/provider/SysUserProvider.java

@@ -35,7 +35,7 @@ public class SysUserProvider {
         if (!StringUtils.isAllBlank(searchKey)) {
             searchKey = StringUtils.trim(searchKey);
             sql.append(" and (");
-            sql.append( "a.user_name like '%").append(searchKey).append("%'");
+            sql.append( "a.real_name like '%").append(searchKey).append("%'");
 //            sql.append( " or a.unit like '%").append(searchKey).append("%'");
             sql.append(")");
         }

gis_admin/src/main/java/com/gis/admin/service/impl/SysUserServiceImpl.java

@@ -82,13 +82,14 @@ public class SysUserServiceImpl extends IBaseServiceImpl<SysUserEntity, Long> im
             entity.setPassword(PasswordUtils.encrypt(param.getUserName(), "123456", PasswordUtils.getStaticSalt()));
             this.save(entity);
             flag = true;
+            id = entity.getId();
         } else {
             entity = this.findById(id);
             if (entity == null) {
                 log.error("用户不存在： {}", id);
                 return Result.failure("用户不存在");
             }
-            if (entity.getRoleId().equals(param.getRoleId())){
+            if (!entity.getRoleId().equals(param.getRoleId())){
                 flag = true;
             }
             BeanUtils.copyProperties(param, entity);

gis_cms/src/main/java/com/gis/cms/entity/po/SceneEntity.java

@@ -40,5 +40,9 @@ public class SceneEntity extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "项目类型")
     private String projectTypeName;
 
+    @Transient
+    @ApiModelProperty(value = "保密级别")
+    private Integer level;
+
 
 }

gis_cms/src/main/java/com/gis/cms/mapper/provider/SceneProvider.java

@@ -14,7 +14,7 @@ public class SceneProvider {
 
     public String search(ScenePageDto param) {
         StringBuffer sql = new StringBuffer(
-                "select a.*, b.name as projectName, c.name as projectTypeName from tb_scene a left join tb_project b on b.id=a.project_id " +
+                "select a.*, b.name as projectName, b.level as level, c.name as projectTypeName from tb_scene a left join tb_project b on b.id=a.project_id " +
                         "left join tb_project_type c on c.id=b.type_id   where a.is_delete=0 and b.is_delete=0 and  a.type='scene' ");
 
 //        if (StringUtils.isNotBlank(param.getStartTime()) && StringUtils.isNotBlank(param.getEndTime())) {

gis_common/src/main/java/com/gis/common/config/WebMvcConfig.java

@@ -3,6 +3,8 @@ package com.gis.common.config;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.alibaba.fastjson.support.config.FastJsonConfig;
 import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
+import com.gis.common.constant.ConfigConstant;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -19,16 +21,24 @@ import java.util.List;
 @Configuration
 public class WebMvcConfig implements WebMvcConfigurer {
 
+    @Autowired
+    ConfigConstant configConstant;
+
     /**
      * 配置全局跨域
+     * 开发、测试环境开启跨域， 正式环境不开启
      */
     @Override
     public void addCorsMappings(CorsRegistry registry) {
-        registry.addMapping("/**")
-                .allowedOrigins("*")
-                .allowCredentials(true)
-                .allowedMethods("GET", "POST", "DELETE", "PUT", "OPTIONS")
-                .maxAge(3600);
+        String active = configConstant.active;
+        if ("dev".equals(active) || "sit".equals(active)){
+            registry.addMapping("/**")
+                    .allowedOrigins("*")
+                    .allowCredentials(true)
+                    .allowedMethods("GET", "POST", "DELETE", "PUT", "OPTIONS")
+                    .maxAge(3600);
+        }
+
     }
 
 

gis_common/src/main/java/com/gis/common/constant/ConfigConstant.java

@@ -22,6 +22,11 @@ public class ConfigConstant {
     @Value("${redis.prefix}")
     public  String redisPrefix;
 
+    /**环境配置*/
+    @Value("${spring.profiles.active}")
+    public String active;
+
+
 //    /**允许上传的文件后缀*/
 //    @Value("${file.allow}")
 //    public String fileAllow;