修改任务相关信息

tuoheng-admin/src/main/java/com/tuoheng/admin/entity/vo/QuestionTypeCountVO.java

@@ -10,7 +10,7 @@ public class QuestionTypeCountVO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "问题类型")
-    private Integer type;
+    private String type;
 
     @ApiModelProperty(value = "问题内容")
     private String content;

tuoheng-admin/src/main/java/com/tuoheng/admin/service/impl/QuestionServiceImpl.java

@@ -180,10 +180,10 @@ public class QuestionServiceImpl extends BaseServiceImpl<QuestionMapper, Questio
         }catch (Exception e){
             e.printStackTrace();
         }
-        Map<Integer,String> codeMap=new HashMap<>();
+        Map<String,String> codeMap=new HashMap<>();
         for (Object questionTypeObject : questionTypeList) {
             JSONObject question=(JSONObject)questionTypeObject;
-            codeMap.put(question.getIntValue("code"),question.getString("content"));
+            codeMap.put(question.getString("code"),question.getString("content"));
         }
         for (QuestionTypeCountVO questionTypeCountVO : questionTypeCountList) {
             questionTypeCountVO.setContent(codeMap.get(questionTypeCountVO.getType()));

tuoheng-system/src/main/resources/mapper/MenuMapper.xml

@@ -22,7 +22,7 @@
         INNER JOIN sys_role_menu AS rm ON m.id=rm.menu_id
         INNER JOIN sys_user_role AS ur ON ur.role_id=rm.role_id
         WHERE ur.user_id=#{userId} AND m.type=1 AND m.`status`=1 AND m.mark=1
-        ORDER BY m.sort ASC;
+        <!--ORDER BY m.sort ASC;-->
     </select>
 
 </mapper>