企业讯息bug优化,项目配置文件jpa自动生成表

64fd58f5 · 邓实川 · ea5e0ba3 · 64fd58f5 · 64fd58f5 · 64fd58f5
Commit 64fd58f5 authored Mar 26, 2020 by 邓实川
9 changed files
--- a/src/main/java/cn/timer/api/bean/yggl/YgglMainEmp.java
+++ b/src/main/java/cn/timer/api/bean/yggl/YgglMainEmp.java
@@ -13,7 +13,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import cn.timer.api.config.swagger.IgnoreSwaggerParameter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

--- a/src/main/java/cn/timer/api/controller/qyxx/CmsController.java
+++ b/src/main/java/cn/timer/api/controller/qyxx/CmsController.java
@@ -293,11 +293,15 @@ public class CmsController {
 				qyxxQueryDto.getTotalPage() == null ? 10 : qyxxQueryDto.getTotalPage());
 		QueryWrapper<CmsContent> queryWrapper = new QueryWrapper<>();
-		queryWrapper.eq("status", 1).eq(t != null && t > -1, "modularid", t).eq(r != null && r > -1, "releasestate", r)
+		queryWrapper
+			.eq("organization_id", userBean.getOrgCode())
+			.eq("status", 1).eq(t != null && t > -1, "modularid", t)
+			.eq(r != null && r > -1, "releasestate", r)
 			.between(!StrUtil.hasBlank(s) && !StrUtil.hasBlank(e), "releasetime",
 						!StrUtil.hasBlank(s) ? s : "1000-01-01 00:00:00",
 						!StrUtil.hasBlank(e) ? e : "9999-01-01 00:00:00")
-				.and(!StrUtil.hasBlank(q), wq -> wq.like("userid", q).or().like("author", q).or().like("title", q))
+			.and(!StrUtil.hasBlank(q), wq -> wq.like("userid", q)
+			.or().like("author", q).or().like("title", q))
 			.orderByDesc("addeddate");
 		IPage<CmsContent> cmsContentPage = CmsContent.builder().build().selectPage(page, queryWrapper);
 		List<CmsContent> cmsContents = cmsContentPage.getRecords();

--- a/src/main/java/cn/timer/api/controller/yggl/YgglController.java
+++ b/src/main/java/cn/timer/api/controller/yggl/YgglController.java
@@ -18,7 +18,6 @@ import java.util.regex.Pattern;
 import javax.transaction.Transactional;
-import org.apache.xmlbeans.impl.xb.xsdschema.Public;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -27,7 +26,6 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -35,8 +33,6 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper;
-import com.baomidou.mybatisplus.extension.service.additional.update.impl.LambdaUpdateChainWrapper;
-import com.github.pagehelper.util.StringUtil;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
@@ -56,7 +52,6 @@ import cn.timer.api.bean.yggl.YgglAttaZcxxb;
 import cn.timer.api.bean.yggl.YgglAttaZszjb;
 import cn.timer.api.bean.yggl.YgglMainEmp;
 import cn.timer.api.bean.yggl.YgglMainLzb;
-import cn.timer.api.dto.yggl.YgmzDto;
 import cn.timer.api.bean.zzgl.ZzglBmgwM;
 import cn.timer.api.config.annotation.CurrentUser;
 import cn.timer.api.config.annotation.UserBean;
@@ -70,18 +65,17 @@ import cn.timer.api.dao.yggl.YgglMainEmpMapper;
 import cn.timer.api.dao.yggl.YgglMainLzbMapper;
 import cn.timer.api.dao.zzgl.ZzglBmgwMMapper;
 import cn.timer.api.dto.yggl.AddygdaDto;
-import cn.timer.api.dto.yggl.IYgjgDto;
 import cn.timer.api.dto.yggl.LzbQueryDto;
 import cn.timer.api.dto.yggl.LzygQueryDto;
-import cn.timer.api.dto.yggl.PunishFactory;
 import cn.timer.api.dto.yggl.YgAreaDto;
 import cn.timer.api.dto.yggl.YgCityDto;
 import cn.timer.api.dto.yggl.YgDrjqbDto;
 import cn.timer.api.dto.yggl.YgDrsDto;
+import cn.timer.api.dto.yggl.YgProDto;
 import cn.timer.api.dto.yggl.YgQueryDto;
 import cn.timer.api.dto.yggl.YgglCartogramDto;
 import cn.timer.api.dto.yggl.YgjgDto;
-import cn.timer.api.dto.yggl.YgProDto;
+import cn.timer.api.dto.yggl.YgmzDto;
 import cn.timer.api.dto.yggl.YgzzDto;
 import cn.timer.api.utils.Md5;
 import cn.timer.api.utils.Result;

--- a/src/main/java/cn/timer/api/dao/yggl/YgCityDtoMapper.java
+++ b/src/main/java/cn/timer/api/dao/yggl/YgCityDtoMapper.java
@@ -4,7 +4,6 @@ import org.springframework.stereotype.Repository;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import cn.timer.api.dto.yggl.YgCityDto;
-import cn.timer.api.dto.yggl.YgProDto;

--- a/src/main/java/cn/timer/api/dto/yggl/YgAreaDto.java
+++ b/src/main/java/cn/timer/api/dto/yggl/YgAreaDto.java
@@ -3,10 +3,8 @@ package cn.timer.api.dto.yggl;
 import java.util.ArrayList;
 import java.util.List;
-import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
-import javax.persistence.Table;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;

--- a/src/main/java/cn/timer/api/dto/yggl/YgCityDto.java
+++ b/src/main/java/cn/timer/api/dto/yggl/YgCityDto.java
@@ -3,10 +3,8 @@ package cn.timer.api.dto.yggl;
 import java.util.ArrayList;
 import java.util.List;
-import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
-import javax.persistence.Table;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;

--- a/src/main/java/cn/timer/api/dto/yggl/YgProDto.java
+++ b/src/main/java/cn/timer/api/dto/yggl/YgProDto.java
@@ -3,10 +3,8 @@ package cn.timer.api.dto.yggl;
 import java.util.ArrayList;
 import java.util.List;
-import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
-import javax.persistence.Table;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;

--- a/src/main/java/cn/timer/api/dto/yggl/YgmzDto.java
+++ b/src/main/java/cn/timer/api/dto/yggl/YgmzDto.java
@@ -3,7 +3,6 @@ package cn.timer.api.dto.yggl;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
-import javax.persistence.Table;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

--- a/src/main/resources/application-pro.yml
+++ b/src/main/resources/application-pro.yml
@@ -10,19 +10,19 @@ spring:
    multipart: 
      max-file-size: 20MB  
      max-request-size: 20MB
-  # jpa:
+  jpa:
    # 配置生成表 存储引擎InnoDB
    # database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
      # database: 
      # open-in-view: false
-      #naming: 
+      # naming: 
      # spring boot jpa hibernate 根据实体类生成表以及字段的命名策略
      # 无修改命名 org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
      # 遇到大写字母 加”_”的命名 org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
-      #physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
+      # physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
-    # hibernate: 
+    hibernate: 
-      # ddl-auto: update
+      ddl-auto: update
-    # show-sql: true
+    show-sql: true
  datasource:
    username: root
    password: youlingHR73!
@@ -114,7 +114,7 @@ pagehelper:
 #showSql
 logging:
  level:
-    root: debug
+    root: info
    cn.timer.api.dao: error
  pattern:
    console: '--%p--%m%n'