🐛 修复收款流水继续认领与付款可付口径，并改用OA登录名提交流程

收款流水部分认领预填关联结算单并修正认领完成判定；正式结算尾款扣减预付占用；预付驳回重提纠正结算引用；临时额度取消强制项目额度校验；用户增加OA登录名供MK流程使用。 Co-authored-by: Cursor <cursoragent@cursor.com>
2026-10-19 17:12:22 +08:00
parent 68a5d581f3
commit fce582e80b
15 changed files with 337 additions and 84 deletions
@@ -70,6 +70,7 @@ public interface UserConvert {
    @Mapping(source = "lastname", target = "realName")
    @Mapping(source = "mobile", target = "phone")
    @Mapping(source = "email", target = "email")
+    @Mapping(source = "loginid", target = "oaLoginId")
    @Mapping(source = "modified", target = "oaModified")
    User baseConvert(OAPersonResponse person);

@@ -26,6 +26,7 @@
        <result column="dept_id" property="deptId"/>
        <result column="post_id" property="postId"/>
        <result column="remark" property="remark"/>
+        <result column="oa_login_id" property="oaLoginId"/>
        <result column="oa_person_id" property="oaPersonId"/>
    </resultMap>

@@ -366,6 +366,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 		user.setPostId(null);
 		user.setAccount(null);
 		user.setIsLeader(null);
+		user.setOaLoginId(null);
 		CacheUtil.clear(USER_CACHE);
 		return submitUserInfo(user);
 	}