修改机构

src/main/java/cn/wisenergy/chnmuseum/party/model/TOrgan.java

@@ -74,23 +74,22 @@ public class TOrgan implements Serializable {
         @NotNull(message = "修改时间不能为空", groups = {Add.class, Update.class})
         private LocalDateTime updateTime;
     
-    @ApiModelProperty("省")
+    @ApiModelProperty("区域")
     @TableField("area_id")
-        @NotNull(message = "省不能为空", groups = {Add.class, Update.class})
+        @NotNull(message = "区域不能为空", groups = {Add.class, Update.class})
         private String areaId;
     
     @ApiModelProperty("icon")
     @TableField("icon")
-        @NotBlank(message = "icon不能为空", groups = {Add.class, Update.class})
         private String icon;
     
     @ApiModelProperty("备注")
     @TableField("remarks")
-        @NotBlank(message = "备注不能为空", groups = {Add.class, Update.class})
         private String remarks;
     
     @ApiModelProperty("级别")
     @TableField("level")
+    @NotNull(message = "区域不能为空", groups = {Add.class, Update.class})
     private Integer level;
 
     @ApiModelProperty("下级机构")

src/main/java/cn/wisenergy/chnmuseum/party/model/TUser.java

@@ -138,4 +138,17 @@ public class TUser implements Serializable {
     @TableField(exist = false)
     private String password;
 
+
+    @TableField(exist = false)
+    private String jwtToken;
+
+    public TUser(String id, String jwtToken) {
+        this.id = id;
+        this.jwtToken = jwtToken;
+    }
+
+    public TUser(String jwtToken) {
+        this.jwtToken = jwtToken;
+    }
+
 }

src/main/java/cn/wisenergy/chnmuseum/party/service/impl/TAreaServiceImpl.java

@@ -12,6 +12,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -29,7 +30,7 @@ import java.util.stream.Collectors;
 @Service
 public class TAreaServiceImpl extends ServiceImpl<TAreaMapper, TArea> implements TAreaService {
 
-    @Autowired
+    @Resource
     private TAreaMapper tAreaMapper;
 
     @Override

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TOrganController.java

@@ -170,7 +170,7 @@ public class TOrganController extends BaseController {
 	@GetMapping("/getTree")
 	@RequiresPermissions("/organ/getTree")
 	@ApiOperation(value = "获取机构树", notes = "获取机构树")
-    @MethodLog(operModule = OperModule.ORG,operType = OperType.SELECT)
+//    @MethodLog(operModule = OperModule.ORG,operType = OperType.SELECT)
 	public Map<String, Object> getTree(String name) {
         List<TOrgan> list = new ArrayList<>();
         if (StringUtils.isBlank(name)) {

src/main/resources/mapper/TAreaMapper.xml

+<?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="cn.wisenergy.chnmuseum.party.mapper.TAreaMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.wisenergy.chnmuseum.party.model.TArea">
+            <id column="id" property="id" />
+                                                            <result column="name" property="name" />
+                <result column="sname" property="sname" />
+                <result column="code" property="code" />
+                <result column="type" property="type" />
+                <result column="parent_id" property="parentId" />
+                <result column="sort_position" property="sortPosition" />
+                <result column="longitude" property="longitude" />
+                <result column="latitude" property="latitude" />
+                <result column="full_name" property="fullName" />
+                <result column="remarks" property="remarks" />
+        </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, sname, code, type, parent_id, sort_position, longitude, latitude, full_name, remarks
+    </sql>
+
+</mapper>