查看bug修复

src/main/java/com/zcloud/controller/api/ApiXgfUserController.java

@@ -27,7 +27,7 @@ public class ApiXgfUserController extends BaseController {
             PageData request = this.getPageData();
             xgfUserService.init(request);
             Map<String, Object> response = new HashMap<String, Object>();
-            response.put("result", "response");
+            response.put("result", "success");
             return response;
         } catch (Exception e) {
             e.printStackTrace();

src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java

@@ -71,7 +71,9 @@ public class XgfUserServiceImpl implements XgfUserService {
                     condition.clear();
                     condition.put("DEPARTMENT_ID",x.get("MANAGER_DEPARTMENT_ID"));
                     PageData regDepartmentEntity = departmentService.getCorpDepartment(condition);
+                    if (regDepartmentEntity != null && regDepartmentEntity.size() > 0) {
                         x.put("MANAGER_DEPARTMENT_NAME",regDepartmentEntity.get("NAME"));
+                    }
                     xgfUserMapper.save(x);
                     xgfUserDetailsMapper.save(x);
                 } else {
@@ -83,8 +85,9 @@ public class XgfUserServiceImpl implements XgfUserService {
                     condition.clear();
                     condition.put("DEPARTMENT_ID",x.get("MANAGER_DEPARTMENT_ID"));
                     PageData regDepartmentEntity = departmentService.getCorpDepartment(condition);
+                    if (regDepartmentEntity != null && regDepartmentEntity.size() > 0) {
                         x.put("MANAGER_DEPARTMENT_NAME",regDepartmentEntity.get("NAME"));
-
+                    }
                     x.put("ISDELETE", "0");
                     x.put("VALID_FLAG", "1");
                     x.put("STATUS", "2");

src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml

@@ -74,7 +74,7 @@
 		update
 		<include refid="tableName"></include>
 		set
-		ISDELETE = '1'
+		IS_DELETE = '1'
 		where
 		XGF_USER_ID = #{XGF_USER_ID}
 	</delete>
@@ -89,7 +89,7 @@
 		VALID_FLAG = #{VALID_FLAG},
 		BELONG_TO_CORP = #{BELONG_TO_CORP},
 		BELONG_TO_CORP_NAME = #{BELONG_TO_CORP_NAME},
-		ISDELETE = #{ISDELETE},
+		IS_DELETE = #{IS_DELETE},
 		CREATE_TIME = #{CREATE_TIME},
 		CORPINFO_ID = #{CORPINFO_ID},
 		STATUS = #{STATUS},
@@ -151,7 +151,7 @@
         from
         <include refid="tableName"></include>
         f
-        where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID}
+        where f.IS_DELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID}
         <if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
             and(f.BELONG_TO_CORP_NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%'))
         </if>
@@ -166,7 +166,7 @@
         from
         <include refid="tableName"></include>
         f
-        where f.ISDELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID}
+        where f.IS_DELETE = '0' and f.CORPINFO_ID = #{pd.CORPINFO_ID}
     </select>
 
 	<!-- 批量删除 -->
@@ -174,7 +174,7 @@
 		update
 		<include refid="tableName"></include>
 		set
-		ISDELETE = '1',
+		IS_DELETE = '1',
 		OPERATOR = #{OPERATOR},
 		OPERATTIME = #{OPERATTIME}
 		where
@@ -191,14 +191,15 @@
         from
         <include refid="tableName"></include>
         f
-        where f.ISDELETE = '0'
+        where f.IS_DELETE = '0'
-        and XGF_USER_ID in
+        and f.XGF_USER_ID in
         <foreach item="item" index="index" collection="XGF_USER_IDS" open="(" separator="," close=")">
             #{item}
         </foreach>
     </select>
 	<select id="flowlistPage" resultType="com.zcloud.entity.PageData">
-        select a.XGF_USER_ID,a.BELONG_TO_CORP,a.BELONG_TO_CORP_NAME,a.USERNAME,a.NAME,b.MANAGER_DEPARTMENT_ID from xgf_user a
+		select a.XGF_USER_ID,a.BELONG_TO_CORP,a.BELONG_TO_CORP_NAME,a.USERNAME,a.NAME,b.MANAGER_DEPARTMENT_ID from
+		xgf_user a
 		left join xgf_user_details b on a.XGF_USER_ID = b.XGF_USER_ID
 		where 1=1
 		<if test="pd.STATUS != null and pd.STATUS != ''">
@@ -207,6 +208,12 @@
 		<if test="pd.UN_STUDY_STATUS != null and pd.UN_STUDY_STATUS != ''">
 			and a.STUDY_STATUS != #{pd.UN_STUDY_STATUS}
 		</if>
+		<if test="pd.STUDY_STATUS != null and pd.STUDY_STATUS != ''">
+			and a.STUDY_STATUS = #{pd.STUDY_STATUS}
+		</if>
+		<if test="pd.CORPINFO_ID != '' and pd.CORPINFO_ID != null">
+			and a.CORPINFO_ID = #{pd.CORPINFO_ID}
+		</if>
 	</select>
 	<select id="getInfoById" resultType="com.zcloud.entity.PageData">
 		select a.XGF_USER_ID,
@@ -220,7 +227,7 @@
 			   b.PHONE,
 			   b.CREATE_TIME,
 			   b.DEPART_STATE,
-			   b.ISDELETE,
+			   b.IS_DELETE,
 			   b.AGE,
 			   b.HKLOCAL,
 			   b.ADDRESS,