Bladeren bron

修改BUG

liuyc 3 jaren geleden
bovenliggende
commit
9d188a464d

+ 0 - 1
blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/WbsTreeContract.java

@@ -29,7 +29,6 @@ public class WbsTreeContract extends BaseEntity {
     /**
      * 主键id
      */
-    @TableId(value = "p_key_Id")
     private Long pKeyId;
 
     /**

+ 6 - 14
blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/TreeNodeVO.java

@@ -21,28 +21,20 @@ public class TreeNodeVO extends BaseNode<TreeNode> {
     )
     private Long value;
 
-    //新增字段
-    @JsonSerialize(
-            using = ToStringSerializer.class
-    )
     private Integer type;
 
-    //主键id
-    @JsonSerialize(
-            using = ToStringSerializer.class
-    )
-    private Integer pKeyId;
+    private Integer prKeyId;
 
 
     public TreeNodeVO() {
     }
 
-    public Integer getpKeyId() {
-        return pKeyId;
+    public Integer getPrKeyId() {
+        return prKeyId;
     }
 
-    public void setpKeyId(Integer pKeyId) {
-        this.pKeyId = pKeyId;
+    public void setPrKeyId(Integer pKeyId) {
+        this.prKeyId = pKeyId;
     }
 
     public Integer getType() {
@@ -78,7 +70,7 @@ public class TreeNodeVO extends BaseNode<TreeNode> {
     }
 
     public String toString() {
-        return "TreeNode(pKeyId=" + this.getpKeyId() + ", type=" + this.getType() + ", title=" + this.getTitle() + ", key=" + this.getKey() + ", value=" + this.getValue() + ")";
+        return "TreeNode(pKeyId=" + this.getPrKeyId() + ", type=" + this.getType() + ", title=" + this.getTitle() + ", key=" + this.getKey() + ", value=" + this.getValue() + ")";
     }
 
     public boolean equals(final Object o) {

+ 2 - 2
blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/ContractInfoMapper.xml

@@ -48,7 +48,7 @@
         <result column="key" property="key"/>
         <result column="has_children" property="hasChildren"/>
         <result column="type" property="type"/>
-        <result column="p_key_id" property="pKeyId"/>
+        <result column="prKeyId" property="prKeyId"/>
     </resultMap>
 
 
@@ -141,7 +141,7 @@
 
     <select id="tree" resultMap="treeNodeResultMap">
         SELECT
-        p_key_id AS pKeyId,
+        p_key_id AS "prKeyId",
         id,
         parent_id,
         dept_name AS title,