From 66996481f5636f30bf9c9781168e1714416b8596 Mon Sep 17 00:00:00 2001
From: zhuyulei <1843199800@qq.com>
Date: Tue, 26 Mar 2024 16:56:30 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=9F=E8=AE=A1=E6=8C=87?=
 =?UTF-8?q?=E6=A0=87=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/core/domain/entity/SysDept.java    |  2 +
 .../SpecialProjectInfoController.java         |  4 +-
 .../service/SpecialProjectInfoService.java    |  6 ++-
 .../resources/mapper/system/SysDeptMapper.xml | 38 ++++++++++---------
 4 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/jwtech-framework/src/main/java/com/jianwei/common/core/domain/entity/SysDept.java b/jwtech-framework/src/main/java/com/jianwei/common/core/domain/entity/SysDept.java
index 741789b5..d0e33992 100644
--- a/jwtech-framework/src/main/java/com/jianwei/common/core/domain/entity/SysDept.java
+++ b/jwtech-framework/src/main/java/com/jianwei/common/core/domain/entity/SysDept.java
@@ -118,6 +118,8 @@ public class SysDept extends BaseEntity
     @TableField(exist = false)
     private List<String> classifyId;//专题库的id集合
 
+    private String unifiedSocialCreditCode;
+
     public List<String> addLibraryIds(String id){
     	if(StringUtils.isEmpty(specialLibraryIds)) {
     		specialLibraryIds = new ArrayList<>();
diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectInfoController.java b/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectInfoController.java
index 90f8dfc3..3e49e262 100644
--- a/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectInfoController.java
+++ b/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectInfoController.java
@@ -91,13 +91,13 @@ public class SpecialProjectInfoController extends BaseController {
     @ApiOperation("专题项目前期背景信息列表")
     public IPage list(@RequestBody SearchParam<SpecialProjectInfo> sp) {
 
-        if (ObjectUtil.isNull(sp.getData())) {
+        /*if (ObjectUtil.isNull(sp.getData())) {
             Page<SpecialProjectInfo> page = new Page<>();
             List<SpecialProjectInfo> list = specialProjectInfoService.list();
             page.setRecords(list);
             page.setTotal(list.size());
             return page;
-        }
+        }*/
 
         IPage<SpecialProjectInfo> specialProjectInfoIPage = specialProjectInfoService.selectPage(sp);
 
diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectInfoService.java b/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectInfoService.java
index bc63aec0..1dc9dd3b 100644
--- a/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectInfoService.java
+++ b/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectInfoService.java
@@ -77,7 +77,11 @@ public class SpecialProjectInfoService extends BaseService<SpecialProjectInfoMap
             list1 = specialProjectInfoMapper.getByUserPro(new Page(sp.getPageNum(),sp.getPageSize()),sysUser.getId(), sysUser.getUserType(), data.getId(), data.getProjectName(), data.getProNo(),
                     data.getProjectType(), sysXzqhService.getSubString(sp.getData().getAdcd()), "create_time");
         } else {
-            list1 = specialProjectInfoMapper.getByUserPro(new Page(sp.getPageNum(),sp.getPageSize()),sysUser.getId(), sysUser.getUserType(), data.getId(), data.getProjectName(), data.getProNo(),
+            list1 = specialProjectInfoMapper.getByUserPro(new Page(sp.getPageNum(),sp.getPageSize()),
+                    sysUser.getId(), sysUser.getUserType(),
+                    data.getId(),
+                    data.getProjectName(),
+                    data.getProNo(),
                     data.getProjectType(), sysXzqhService.getSubString(sp.getData().getAdcd()), (String) params.get("orderBy"));
         }
 
diff --git a/jwtech-system/src/main/resources/mapper/system/SysDeptMapper.xml b/jwtech-system/src/main/resources/mapper/system/SysDeptMapper.xml
index 92b4d6c6..9259b93d 100644
--- a/jwtech-system/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/jwtech-system/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -34,15 +34,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="beginDate"    column="begin_date"    />
 		<result property="endDate"    column="end_date"    />
 	</resultMap>
-	
+
 	<sql id="selectDeptVo">
-        select d.id,d.ip_start,d.ip_end,d.is_download,d.is_comment, d.parent_id, d.ancestors, 
-        d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status,d.tag, 
+        select d.id,d.ip_start,d.ip_end,d.is_download,d.is_comment, d.parent_id, d.ancestors,
+        d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status,d.tag,
         d.del_flag, d.create_uid, d.create_time, d.name, d.pc_logo, d.pc_background,
-        d.admin_name, d.admin_logo,d.data_type,d.begin_date,d.end_date,d.xzqh_id,d.xzqh_name
+        d.admin_name, d.admin_logo,d.data_type,d.begin_date,d.end_date,d.xzqh_id,d.xzqh_name,d.unifiedSocialCreditCode
         from sys_dept d
     </sql>
-    
+
 	<select id="selectDeptList" parameterType="com.jianwei.common.core.domain.entity.SysDept" resultMap="SysDeptResult">
         <include refid="selectDeptVo"/>
         where d.del_flag = '0'
@@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		${params.dataScope}
 		order by d.parent_id, d.order_num
     </select>
-    
+
     <select id="selectDeptListByRoleId" parameterType="String" resultType="Integer">
 		select d.id, d.parent_id
 		from sys_dept d
@@ -71,34 +71,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         	and d.id not in (select d.parent_id from sys_dept d inner join sys_role_dept rd on d.id = rd.dept_id and rd.role_id = #{roleId})
 		order by d.parent_id, d.order_num
 	</select>
-    
+
     <select id="selectDeptById" parameterType="String" resultMap="SysDeptResult">
 		<include refid="selectDeptVo"/>
 		where id = #{id}
 	</select>
-    
+
     <select id="checkDeptExistUser" parameterType="String" resultType="int">
 		select count(1) from sys_user where id = #{id} and del_flag = '0'
 	</select>
-	
+
 	<select id="hasChildByDeptId" parameterType="String" resultType="int">
 		select count(1) from sys_dept
 		where del_flag = '0' and parent_id = #{id} limit 1
 	</select>
-	
+
 	<select id="selectChildrenDeptById" parameterType="String" resultMap="SysDeptResult">
 		select * from sys_dept where find_in_set(#{id}, ancestors)
 	</select>
-	
+
 	<select id="selectNormalChildrenDeptById" parameterType="String" resultType="int">
 		select count(*) from sys_dept where status = 0 and del_flag = '0' and find_in_set(#{id}, ancestors)
 	</select>
-	
+
 	<select id="checkDeptNameUnique" resultMap="SysDeptResult">
 	    <include refid="selectDeptVo"/>
 		where dept_name=#{deptName} and parent_id = #{parentId} limit 1
 	</select>
-    
+
     <insert id="insertDept" parameterType="com.jianwei.common.core.domain.entity.SysDept">
  		insert into sys_dept(
  			<if test="id != null and id != ''">id,</if>
@@ -125,6 +125,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="adminName != null and adminName != ''">admin_name,</if>
  			<if test="adminLogo != null and adminLogo != ''">admin_logo,</if>
  			<if test="xzqhId != null and adminLogo != ''">xzqh_id,</if>
+ 		    <if test="unifiedSocialCreditCode!=null and unifiedSocialCreditCode!=''">unified_social_credit_code</if>
  			create_time
  		)values(
  			<if test="id != null and id != ''">#{id},</if>
@@ -151,10 +152,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="adminName != null and adminName != ''">#{adminName},</if>
 			<if test="adminLogo != null and adminLogo != ''">#{adminLogo},</if>
 		<if test="xzqhId != null and adminLogo != ''">#{xzqhId},</if>
+		<if test="unifiedSocialCreditCode!=null and unifiedSocialCreditCode!=''">#{unifiedSocialCreditCode}</if>
  			sysdate()
  		)
 	</insert>
-	
+
 	<update id="updateDept" parameterType="com.jianwei.common.core.domain.entity.SysDept">
  		update sys_dept
  		<set>
@@ -183,7 +185,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  		</set>
  		where id = #{id}
 	</update>
-	
+
 	<update id="updateDeptChildren" parameterType="java.util.List">
 	    update sys_dept set ancestors =
 	    <foreach collection="depts" item="item" index="index"
@@ -196,7 +198,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	        #{item.id}
 	    </foreach>
 	</update>
-	 
+
 	 <update id="updateDeptStatus" parameterType="com.jianwei.common.core.domain.entity.SysDept">
  	    update sys_dept a
  	    <set>
@@ -206,9 +208,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </set>
  	    where FIND_IN_SET(a.id,#{ancestors})
 	</update>
-	
+
 	<delete id="deleteDeptById" parameterType="String">
 		delete from sys_dept where id = #{id}
 	</delete>
 
-</mapper> 
\ No newline at end of file
+</mapper>