diff --git a/src/main/java/com/zcloud/controller/system/LoginController.java b/src/main/java/com/zcloud/controller/system/LoginController.java
index 3ae08999..5c93c4f0 100644
--- a/src/main/java/com/zcloud/controller/system/LoginController.java
+++ b/src/main/java/com/zcloud/controller/system/LoginController.java
@@ -70,7 +70,7 @@ public class LoginController extends BaseController {
 
     @Autowired
     private PhotoService photoService;
-//    @Value("${czks-useridentity}")
+    //    @Value("${czks-useridentity}")
 //    private String czksIdentity;
 //    @Value("${czks-baseimgpath}")
 //    private String czksBaseimgpath;
@@ -212,7 +212,6 @@ public class LoginController extends BaseController {
                             return map;
                         }
                     }
-
                     if ("99".equals(pd.getString("STATUS"))) {
                         errInfo = "userlock";
                         map.put("result", "fail");
diff --git a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java
index 24ff5055..cc0e8d35 100644
--- a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java
+++ b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java
@@ -226,6 +226,7 @@ public class XgfUserServiceImpl implements XgfUserService {
                 condition.put("FOREIGN_KEY", x.getString("XGF_USER_ID"));
                 condition.put("TYPE", "1");
                 condition.put("VALID_FLAG", "1");
+                condition.put("END_FLAG", "0");
                 PageData flow = flowMapper.findByCondition(condition);
                 if (flow == null || flow.size() == 0) {
                     /* 保存审批流程信息 */
diff --git a/src/main/resources/mybatis/datasource/firemanager/FirePreparedCheckListMapper.xml b/src/main/resources/mybatis/datasource/firemanager/FirePreparedCheckListMapper.xml
index d186509b..b5479cbe 100644
--- a/src/main/resources/mybatis/datasource/firemanager/FirePreparedCheckListMapper.xml
+++ b/src/main/resources/mybatis/datasource/firemanager/FirePreparedCheckListMapper.xml
@@ -113,7 +113,6 @@
                 LEFT JOIN sys_dictionaries d on fd.FIRE_DEVICE_TYPE_ID = d.BIANMA
         WHERE
             fpc.FIRE_CHECK_ID = #{FIRE_CHECK_ID}
-          AND fcs.ISDELETE = 0
           AND fpc.ISDELETE = 0
           AND fd.ISDELETE = 0
           AND fr.ISDELETE = 0
diff --git a/src/main/resources/mybatis/datasource/xgf/FlowMapper.xml b/src/main/resources/mybatis/datasource/xgf/FlowMapper.xml
index 1c1b56e7..6a013cb7 100644
--- a/src/main/resources/mybatis/datasource/xgf/FlowMapper.xml
+++ b/src/main/resources/mybatis/datasource/xgf/FlowMapper.xml
@@ -101,6 +101,9 @@
         <if test="VALID_FLAG != null and VALID_FLAG != ''">
             and a.VALID_FLAG = #{VALID_FLAG}
         </if>
+        <if test="END_FLAG != null and END_FLAG != ''">
+            and a.END_FLAG = #{END_FLAG}
+        </if>
     </select>
     <select id="getList" resultType="com.zcloud.entity.PageData">
         select * from bus_flow a where a.ISDELETE = '0'