Merge remote-tracking branch 'origin/master'

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/controller/my/AppEvaluateController.java

@@ -50,6 +50,7 @@ public class AppEvaluateController {
     @PostMapping("/submitFeedback")
     @Operation(summary = "提交评价")
     public Result<String> submitFeedback(@RequestBody AddEvaluateDTO addEvaluateDTO) {
+        //缺少订单校验逻辑 需要校验订单并且
         Evaluate evaluate = new Evaluate();
         LoginUser principal = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         BeanUtils.copyProperties(addEvaluateDTO, evaluate);

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/mapper/xml/EvaluateMapper.xml

@@ -4,9 +4,9 @@
 
     <select id="findPage" resultType="org.jeecg.modules.system.app.dto.evaluate.FindEvaluateResponseDTO">
         select
-            ne.score,ne.evaluate_content,ne.avatar,ne.images,ne.check_status,ne.reply_status,ne.reply_content,ne.reply_time,ne.type,ne.create_time,sd.depart_name,ns.address,su.username,su.phone
+            ne.score,ne.evaluate_content,su.avatar,ne.images,ne.check_status,ne.reply_status,ne.reply_content,ne.reply_time,ne.type,ne.create_time,sd.depart_name,ns.address,su.username,su.phone
         from nm_evaluate ne
-        left join  sys_depart sd on  ne.dept_id = s.id
+        left join  sys_depart sd on  ne.dept_id = sd.id
         LEFT JOIN nm_site ns on  ne.site_id =ns.id
         LEFT JOIN sys_user su on  ne.user_id =su.id
         where 1=1
@@ -15,7 +15,7 @@
                 and ne.org_code like CONCAT('',#{findEvaluateRequestDTO.orgCode},'%')
             </if>
         <if test="findEvaluateRequestDTO.deptId!=null and findEvaluateRequestDTO.deptId!=''">
-            AND ne.score = #{findEvaluateRequestDTO.deptId}
+            AND ne.deptId = #{findEvaluateRequestDTO.deptId}
         </if>
         <if test="findEvaluateRequestDTO.score!=null">
             AND ne.score = #{findEvaluateRequestDTO.score}