admin

src/main/java/com/smcic/api/admin/entity/Organ.java

@@ -41,11 +41,14 @@ public class Organ implements Serializable {
 
     private String info;
 
-    @TableField(exist = false)
-    private List<Organ> children;
+    /*@TableField(exist = false)
+    private List<Organ> children;*/
 
     @TableField(exist = false)
     private List<Users> users = new ArrayList<>();
 
+    @TableField(exist = false)
+    private Organ parent;
+
 
 }

src/main/java/com/smcic/api/admin/service/impl/OrganServiceImpl.java

@@ -9,6 +9,7 @@ import com.smcic.api.admin.entity.Users;
 import com.smcic.api.admin.mapper.OrganMapper;
 import com.smcic.api.admin.service.IOrganService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.http.util.TextUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -35,11 +36,12 @@ public class OrganServiceImpl extends ServiceImpl<OrganMapper, Organ> implements
     public Page<Organ> organList (NamePageDTO namePageDTO) {
         LambdaQueryWrapper<Organ> lambdaQueryWrapper = Wrappers.lambdaQuery();
         Page<Organ> organPage = baseMapper.selectPage(new Page<>(namePageDTO.getPage(), namePageDTO.getPageSize()),
-                lambdaQueryWrapper.eq(Organ::getPid, 0).orderByDesc(Organ::getOrganId));
+                lambdaQueryWrapper.like(!TextUtils.isEmpty(namePageDTO.getName()), Organ::getName, namePageDTO.getName())
+                        .orderByDesc(Organ::getOrganId));
 
         if(organPage.getTotal() > 0) {
             organPage.setRecords(organPage.getRecords().stream().peek(organ -> {
-                organ.setChildren(lambdaQuery().eq(Organ::getPid, organ.getOrganId()).list());
+                organ.setParent(getById(organ.getPid()));
             }).collect(Collectors.toList()));
         }
         return organPage;

src/test/java/neican.http

@@ -282,6 +282,13 @@ Authorization: {{token}}
 
 ### 客户重置密码
 POST {{ip}}/admin/custom/pwd-reset
+Content-Type: application/json
+Authorization: {{token}}
+
+{
+  "userId": 2,
+  "password": "123456"
+}
 
 
 ### 领导管理,头像上传