提交

jy-business/src/main/java/com/jy/business/corporation/dao/CorporationDao.java

@@ -7,11 +7,16 @@ import com.jy.business.corporation.model.entity.Corporation;
 import com.jy.business.corporation.model.table.CorporationTable;
 import com.jy.business.corporation.model.vo.CorporationVo;
 import com.jy.framework.model.base.BaseDao;
+import com.jy.system.service.AuthService;
+import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 
 @Service
 public class CorporationDao extends BaseDao<CorporationMapper, Corporation> {
 
+    @Resource
+    private AuthService authService;
+
     /**
      * 公司信息分页
      */
@@ -24,10 +29,13 @@ public class CorporationDao extends BaseDao<CorporationMapper, Corporation> {
                 )
                 .from(c)
                 .where(
-
+                        c.createUser.in(authService.getUserPermissionSet()),
+                        c.name.like(dto.getName()),
+                        c.type.eq(dto.getType()),
+                        c.uscCode.like(dto.getUscCode())
                 )
                 .orderBy(
-                    c.id.desc()
+                        c.id.desc()
                 )
                 .page(dto.getPage());
     }
@@ -44,7 +52,7 @@ public class CorporationDao extends BaseDao<CorporationMapper, Corporation> {
                 )
                 .from(c)
                 .where(
-                    c.id.eq(id)
+                        c.id.eq(id)
                 )
                 .one();
     }

jy-business/src/main/java/com/jy/business/corporation/model/dto/CorporationSelectDto.java

@@ -14,4 +14,19 @@ import lombok.Setter;
 @Setter
 public class CorporationSelectDto extends BaseSelectDto {
 
+    /**
+     * 公司名称
+     */
+    private String name;
+
+    /**
+     * 企业类型
+     */
+    private Integer type;
+
+    /**
+     * 统一信用代码
+     */
+    private String uscCode;
+
 }

jy-generator/src/main/resources/templates/dao.java.btl

@@ -10,6 +10,8 @@ import ${package.Entity}.${entity};
 import ${entityPath}.table.${entity}Table;
 import ${entityPath}.vo.${table.entityName}Vo;
 import com.jy.framework.model.base.BaseDao;
+import com.jy.system.service.AuthService;
+import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 
 <% if(isNotEmpty(controllerMethods.list)){  %>
@@ -19,6 +21,9 @@ import java.util.List;
 @Service
 public class ${table.entityName}Dao extends BaseDao<${table.entityName}Mapper, ${table.entityName}> {
 
+    @Resource
+    private AuthService authService;
+
 <% if(isNotEmpty(controllerMethods.list)){  %>
     /**
      * ${table.comment!}列表
@@ -32,7 +37,7 @@ public class ${table.entityName}Dao extends BaseDao<${table.entityName}Mapper, $
                 )
                 .from(${tableAlias})
                 .where(
-
+                        ${tableAlias}.createUser.in(authService.getUserPermissionSet())
                 )
                 .orderBy(
                     ${tableAlias}.id.desc()
@@ -54,10 +59,10 @@ public class ${table.entityName}Dao extends BaseDao<${table.entityName}Mapper, $
                 )
                 .from(${tableAlias})
                 .where(
-
+                        ${tableAlias}.createUser.in(authService.getUserPermissionSet())
                 )
                 .orderBy(
-                    ${tableAlias}.id.desc()
+                        ${tableAlias}.id.desc()
                 )
                 .page(dto.getPage());
     }
@@ -76,7 +81,7 @@ public class ${table.entityName}Dao extends BaseDao<${table.entityName}Mapper, $
                 )
                 .from(${tableAlias})
                 .where(
-                    ${tableAlias}.id.eq(id)
+                        ${tableAlias}.id.eq(id)
                 )
                 .one();
     }