更改bug

mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/UseraccountServiceImpl.java

@@ -206,6 +206,14 @@ public class UseraccountServiceImpl extends ServiceImpl<IUseraccountMapper, User
     private DetailAfterResult getModifyInvestorDetail(Long userid) {
         DetailAfterResult detailResult = new DetailAfterResult();
         UserAccountDetailVo userAccountDetailVo = iUseraccountMapper.selectNewDetail(userid);
+        // 从draft表NewContent取内容
+        DraftUseraccountNew dua = JsonUtils.json2Object(userAccountDetailVo.getNewcontent(), DraftUseraccountNew.class);
+        if (dua == null) {
+            userAccountDetailVo.setHasAuth(0);
+        } else {
+            userAccountDetailVo.setHasAuth(dua.getHasauth());
+        }
+
         detailResult.setUserAccountDetailVo(userAccountDetailVo);
         UserinfoDetailVo userinfoDetailVo = iUserinfoMapper.getUserinfoNewDetail(userid);
         detailResult.setUserinfoDetailVo(userinfoDetailVo);
@@ -712,7 +720,7 @@ public class UseraccountServiceImpl extends ServiceImpl<IUseraccountMapper, User
         }
 
         // 更新是否实名、newContent字段 -- dyp
-        dua.setHasauth(param.getUserAccountDetailVo().getIsAuth());
+        dua.setHasauth(param.getUserAccountDetailVo().getHasAuth());
         dua.setNewcontent(JsonUtils.object2Json(dua));
 
         dua.setOldcontent(JsonUtils.object2Json(useraccount));

mtp3-century/src/main/resources/mapper/UseraccountMapper.xml

@@ -70,7 +70,7 @@
         <result column="accountId" property="accountId" />
         <result column="refereeName" property="refereeName" />
         <result column="accountName" property="accountName" />
-        <result column="isAuth" property="isAuth" />
+        <result column="hasauth" property="hasAuth" />
         <result column="accountstatus" property="accountStatus" />
         <result column="modifystatus" property="modifyStatus" />
         <result column="createtime" property="createTime" />
@@ -90,7 +90,7 @@
         <result column="createtime" property="createTime" />
         <result column="modifytime" property="modifyTime"/>
         <result column="modifystatus" property="modifyStatus" />
-        <result column="hasauth" property="isAuth" />
+        <result column="hasauth" property="hasAuth" />
         <result column="modifyremark" property="modifyRemark" />
         <result column="audittime" property="auditTime" />
         <result column="accountstatus" property="accountStatus" />
@@ -98,6 +98,8 @@
         <result column="usertype" property="usertype" />
         <result column="refereeuserid" property="refereeuserid" />
         <result column="auditremark" property="auditremark" />
+        <result column="newcontent" property="newcontent" />
+        <result column="oldcontent" property="oldcontent" />
         <association property="auditAccountName" column="AUDITUSERID"
                      jdbcType="VARCHAR"
                      select="com.muchinfo.mtp3interface.mapper.ISystemmanagerMapper.selectUsersName"></association>
@@ -331,7 +333,7 @@
         where ba.signstatus=4 group by ta.userid
         )
         select uaref.accountname refereeName, t1.loginid loginId,ta.accountid accountId,o.accountname accountName
-         ,o.hasauth isAuth,o.accountstatus,o.modifystatus,o.createtime,o.modifytime,o.audittime,o.canceltime,o.userid,
+         ,o.hasauth hasAuth,o.accountstatus,o.modifystatus,o.createtime,o.modifytime,o.audittime,o.canceltime,o.userid,
         o.memberuserid, o.parentuserid
         from useraccount o
         left join t1 on o.userid = t1.userid
@@ -343,8 +345,8 @@
         <where>
             1 = 1
             and o.usertype = 5
-            <if test="vo.isAuth != null">
-                AND o.hasauth = #{vo.isAuth}
+            <if test="vo.hasAuth != null">
+                AND o.hasauth = #{vo.hasAuth}
             </if>
             <if test="vo.accountName != null and vo.accountName != '' ">
                 and ((o.accountname like '%'|| #{vo.accountName,jdbcType=VARCHAR}||'%')

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/investor/DealerQueryParam.java

@@ -27,7 +27,7 @@ public class DealerQueryParam {
     @ApiModelProperty(value = "交易商状态")
     private String accountStatus;
     @ApiModelProperty(value = "是否实名")
-    private Integer isAuth;
+    private Integer hasAuth;
     @ApiModelProperty(value = "所属经纪人")
     private String brokerName;
     @ApiModelProperty(value = "推荐人")

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/investor/DealerQueryResult.java

@@ -57,7 +57,7 @@ public class DealerQueryResult {
     @ExcelProperty(value = "是否实名", converter = IsAuthConverter.class)
     @ColumnWidth(20)
     @ApiModelProperty(value = "是否实名")
-    private Integer isAuth;
+    private Integer hasAuth;
 
     @ExcelProperty(value = "状态", converter = AccountStatusConverter.class)
     @ColumnWidth(20)

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/investor/UserAccountDetailVo.java

@@ -58,9 +58,8 @@ public class UserAccountDetailVo {
     @Builder.Default
     private Integer modifyStatus = 0;
 
-    @ApiModelProperty(value = "userAccount -- isAuth/固定用before")
-    @Builder.Default
-    private Integer isAuth = 0;
+    @ApiModelProperty(value = "userAccount -- hasAuth/固定用before")
+    private Integer hasAuth;
 
     @ApiModelProperty(value = "userAccount -- 变更审核备注/固定用before")
     @Builder.Default
@@ -83,4 +82,8 @@ public class UserAccountDetailVo {
     private Long refereeuserid = 0L;
 
     private String auditremark;
+
+    private String newcontent;
+
+    private String oldcontent;
 }