Merge branch 'zhg' into 'master'

Zhg

See merge request !4

hmit-admin/src/main/java/io/hmit/modules/fhjw/controller/FhjwCommentController.java

@@ -26,6 +26,7 @@ import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -101,7 +102,7 @@ public class FhjwCommentController {
 
     public Result<List<CommitteeCountDTO>> getCountByMouth() {
         List<CommitteeCountDTO> getCounts= fhjwCommentService.getCountByMouth();
-
+        Collections.reverse(getCounts);
         return new Result<List<CommitteeCountDTO>>().ok(getCounts);
     }
 

hmit-admin/src/main/java/io/hmit/modules/fhjw/service/impl/UserServiceImpl.java

@@ -156,6 +156,8 @@ public class UserServiceImpl extends CrudServiceImpl<UserDao, UserEntity, UserDT
         user.setMobile(dto.getMobile());
         user.setCreateDate(new Date());
         user.setUserIdno(dto.getUserIdno());
+        user.setGender(dto.getGender());
+        user.setIdentity(dto.getIdentity());
         insert(user);
 
         //人员-权限对应关系表

hmit-api/src/main/java/io/hmit/modules/fhjw/service/impl/FhiwFunctionServiceImpl.java

@@ -132,7 +132,7 @@ public class FhiwFunctionServiceImpl extends CrudServiceImpl<FhiwFunctionDao, Fh
         }
 
         //根据是否存在代理人，判断是否添加 "我要填写评测" 的权限！
-        Long funcId = baseDao.selectOne(new QueryWrapper<FhiwFunctionEntity>().eq("name","我要填写评测")).getId();
+        Long funcId = baseDao.selectOne(new QueryWrapper<FhiwFunctionEntity>().eq("name","我要填写测评")).getId();
         List<Long> funIds = new ArrayList<>();
         if(flag){
             logger.info("存在代理人");