更改bug

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

@@ -126,7 +126,8 @@ public class FuncmenulistServiceImpl extends ServiceImpl<IFuncmenulistMapper, Fu
     public List<TreeNode> menuAllList(Integer menuType) {
         List<Funcmenulist> funcmenulists = iFuncmenulistMapper.selectList(new QueryWrapper<Funcmenulist>()
                 .eq("MENUTYPE", menuType)
-                .eq("hidden", 1));
+                .eq("hidden", 1)
+                .orderBy(true,true,"sort"));
         return changeMenuToTreeNode(funcmenulists);
     }
 

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

@@ -1290,7 +1290,7 @@ public class TaaccountServiceImpl extends ServiceImpl<ITaaccountMapper, Taaccoun
         taAccountQueryResult.setParentAccountId(taaccount.getParentaccountid());
         taAccountQueryResult.setRelatedUserId(taaccount.getRelateduserid());
         taAccountQueryResult.setRelatedAccountStatus(taaccount.getRelatedaccountstatus());
-        taAccountQueryResult.setCurrency(iEnumdicitemMapper.selectCurrencyName(taaccount.getCurrencyid()));
+        taAccountQueryResult.setCurrency(taaccount.getCurrencyid());
         taAccountQueryResult.setTaAccountType(taaccount.getTaaccounttype());
         taAccountQueryResult.setChangeFlag(taaccount.getChangeflag());
         taAccountQueryResult.setTradeStatus(taaccount.getTradestatus());

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

@@ -98,13 +98,6 @@
         order by b.applicationtime desc
     </select>
 
-    <select id="getBankname" parameterType="long" resultType="string">
-        select
-            bc.bankname
-        from Bank_BankInfo bc
-        where bc.bankid = #{bankid,jdbcType=VARCHAR}
-    </select>
-
     <select id="query" resultType="com.muchinfo.mtp3pojos.vo.organ.UserAccountSignlogResult">
         select '--' as histradedate, t.* from Bank_AccountSignLog t
         <where>

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

@@ -71,6 +71,7 @@
         <result column="tradestatus" property="tradeStatus" />
         <result column="relateduserid" property="relatedUserId" />
         <result column="userid" property="userId" />
+        <result column="currencyid" property="currencyid" />
         <result column="relatedaccountstatus" property="relatedAccountStatus" />
         <association property="accountName" column="USERID"
                      jdbcType="VARCHAR"
@@ -78,9 +79,6 @@
         <association property="relatedName" column="RELATEDUSERID"
                      jdbcType="VARCHAR"
                      select="com.muchinfo.mtp3interface.mapper.IUseraccountMapper.selectOrganName"></association>
-        <association property="currency" column="CURRENCYID"
-                     jdbcType="VARCHAR"
-                     select="com.muchinfo.mtp3interface.mapper.IEnumdicitemMapper.selectCurrencyName"></association>
     </resultMap>
     <!--资金流水列表查询-->
     <resultMap id="resultAmountStream" type="com.muchinfo.mtp3pojos.vo.taaccount.TaAccountAmountStreamResult">

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/taaccount/TaAccountQueryResult.java

@@ -35,7 +35,7 @@ public class TaAccountQueryResult {
     private Integer tradeStatus;
 
     @ApiModelProperty(value = "币种")
-    private String currency;
+    private Integer currencyid;
 
     @ApiModelProperty(value = "所属用户")
     private String accountName;

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/taaccount/TaAccountQueryResultDetail.java

@@ -40,7 +40,7 @@ public class TaAccountQueryResultDetail {
     private Integer relatedAccountStatus;
 
     @ApiModelProperty(value = "币种")
-    private String currency;
+    private Integer currency;
 
     @ApiModelProperty(value = "内/外部 0 内部账户,1 外部账户")
     private Integer taAccountType;