guoyuepeng
/
qa-prevention-gwj
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/liujun-2024-04-07-相关方新需求' into pet 

# Conflicts:
#	src/main/java/com/zcloud/controller/system/LoginController.java
#	src/main/java/com/zcloud/service/system/impl/CorpPathServiceImpl.java
liujun-2024-05-23-接口漏洞修复
liujun 2024-04-08 15:32:28 +08:00
parent 31c855f37f b1f060afb5
commit b1aed688e2
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/zcloud/controller/system/LoginController.java
View File

@ -70,7 +70,7 @@ public class LoginController extends BaseController {
@Autowired @Autowired
private PhotoService photoService; private PhotoService photoService;
// @Value("${czks-useridentity}") // @Value("${czks-useridentity}")
// private String czksIdentity; // private String czksIdentity;
// @Value("${czks-baseimgpath}") // @Value("${czks-baseimgpath}")
// private String czksBaseimgpath; // private String czksBaseimgpath;
@ -212,7 +212,6 @@ public class LoginController extends BaseController {
return map; return map;
} }
} }
if ("99".equals(pd.getString("STATUS"))) { if ("99".equals(pd.getString("STATUS"))) {
errInfo = "userlock"; errInfo = "userlock";
map.put("result", "fail"); map.put("result", "fail");

1
src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java
View File

@ -226,6 +226,7 @@ public class XgfUserServiceImpl implements XgfUserService {
condition.put("FOREIGN_KEY", x.getString("XGF_USER_ID")); condition.put("FOREIGN_KEY", x.getString("XGF_USER_ID"));
condition.put("TYPE", "1"); condition.put("TYPE", "1");
condition.put("VALID_FLAG", "1"); condition.put("VALID_FLAG", "1");
condition.put("END_FLAG", "0");
PageData flow = flowMapper.findByCondition(condition); PageData flow = flowMapper.findByCondition(condition);
if (flow == null || flow.size() == 0) { if (flow == null || flow.size() == 0) {
/* 保存审批流程信息 */ /* 保存审批流程信息 */

1
src/main/resources/mybatis/datasource/firemanager/FirePreparedCheckListMapper.xml
View File

@ -113,7 +113,6 @@
LEFT JOIN sys_dictionaries d on fd.FIRE_DEVICE_TYPE_ID = d.BIANMA LEFT JOIN sys_dictionaries d on fd.FIRE_DEVICE_TYPE_ID = d.BIANMA
WHERE WHERE
fpc.FIRE_CHECK_ID = #{FIRE_CHECK_ID} fpc.FIRE_CHECK_ID = #{FIRE_CHECK_ID}
AND fcs.ISDELETE = 0
AND fpc.ISDELETE = 0 AND fpc.ISDELETE = 0
AND fd.ISDELETE = 0 AND fd.ISDELETE = 0
AND fr.ISDELETE = 0 AND fr.ISDELETE = 0

3
src/main/resources/mybatis/datasource/xgf/FlowMapper.xml
View File

@ -101,6 +101,9 @@
<if test="VALID_FLAG != null and VALID_FLAG != ''"> <if test="VALID_FLAG != null and VALID_FLAG != ''">
and a.VALID_FLAG = #{VALID_FLAG} and a.VALID_FLAG = #{VALID_FLAG}
</if> </if>
<if test="END_FLAG != null and END_FLAG != ''">
and a.END_FLAG = #{END_FLAG}
</if>
</select> </select>
<select id="getList" resultType="com.zcloud.entity.PageData"> <select id="getList" resultType="com.zcloud.entity.PageData">
select * from bus_flow a where a.ISDELETE = '0' select * from bus_flow a where a.ISDELETE = '0'