fuintBackend/fuint-application/src/main/java/com/fuint/common/domain/TreeNode.java

@@ -18,7 +18,7 @@ import java.util.List;
 public class TreeNode implements Serializable {
 
     @ApiModelProperty("菜单ID")
-    private long id;
+    private Long id;
 
     @ApiModelProperty("菜单名称")
     private String name;
@@ -51,7 +51,7 @@ public class TreeNode implements Serializable {
     private int level;
 
     @ApiModelProperty("上级菜单")
-    private long pId;
+    private Long pId;
 
     @ApiModelProperty("图标")
     private String icon;

fuintBackend/fuint-application/src/main/java/com/fuint/common/dto/SourceDto.java

@@ -17,7 +17,7 @@ import java.util.List;
 public class SourceDto implements Serializable {
 
     @ApiModelProperty("自增ID")
-    private long id;
+    private Long id;
 
     @ApiModelProperty("商户ID")
     private Long merchantId;
@@ -50,7 +50,7 @@ public class SourceDto implements Serializable {
     private int level;
 
     @ApiModelProperty("上级菜单")
-    private long parentId;
+    private Long parentId;
 
     @ApiModelProperty("子菜单")
     private List<SourceDto> children;

fuintBackend/fuint-application/src/main/java/com/fuint/common/dto/ext/CurrencyDto.java

@@ -33,6 +33,7 @@ public class CurrencyDto implements Serializable {
     @ApiModelProperty("货币名称")
     private String name;
 
-
+    @ApiModelProperty("货币符号")
+    private String symbol;
 
 }

fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/DutyServiceImpl.java

@@ -284,7 +284,7 @@ public class DutyServiceImpl extends ServiceImpl<TDutyMapper, TDuty> implements
                  sourceTreeNode.setName(tDuty.getDutyName());
                  sourceTreeNode.setId(tDuty.getDutyId());
                  sourceTreeNode.setLevel(1);
-                 sourceTreeNode.setPId(0);
+                 sourceTreeNode.setPId(0L);
                  trees.add(sourceTreeNode);
             }
         }

fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/SourceServiceImpl.java

@@ -80,7 +80,7 @@ public class SourceServiceImpl extends ServiceImpl<TSourceMapper, TSource> imple
                 if (tSource.getParentId() != null) {
                     sourceTreeNode.setPId(tSource.getParentId());
                 } else {
-                    sourceTreeNode.setPId(0);
+                    sourceTreeNode.setPId(0L);
                 }
                 trees.add(sourceTreeNode);
             }

fuintBackend/fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendSourceController.java

@@ -133,7 +133,7 @@ public class BackendSourceController extends BaseController {
         tSource.setEname(eName);
 
         if (StringUtil.isNotBlank(parentId)) {
-            if (Integer.parseInt(parentId) > 0) {
+            if (Long.parseLong(parentId) > 0) {
                 TSource parentSource = sourceService.getById(parentId);
                 tSource.setParentId(parentSource.getSourceId());
                 tSource.setSourceLevel(parentSource.getSourceLevel() + 1);

fuintBackend/fuint-repository/src/main/resources/mapper/TAccountDutyMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fuint.repository.mapper.TAccountDutyMapper">
-    <select id="getDutyIdsByAccountId" resultType="java.lang.Integer">
+    <select id="getDutyIdsByAccountId" resultType="java.lang.Long">
         select distinct duty_id from t_account_duty t where t.acct_id = #{accountId}
     </select>