Merge branch 'han' of uskycloud/usky-cloud into system-165

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/controller/web/MceReceiveController.java

@@ -115,5 +115,15 @@ public class MceReceiveController {
         mceReceiveService.add(mceReceive);
         return ApiResult.success();
     }
+
+    /**
+     * 删除
+     */
+    @DeleteMapping("/{id}")
+    public ApiResult<Void> removeById(@PathVariable("id") Integer id)
+    {
+        mceReceiveService.removeById(id);
+        return ApiResult.success();
+    }
 }
 

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/domain/MceReceive.java

@@ -92,8 +92,8 @@ public class MceReceive implements Serializable {
     private LocalDateTime updateTime;
 
     /**
-     * 发布人ID
+     * 发布人
      */
-    private Integer issuerId;
+    private String issuerName;
 
 }

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/MceReceiveService.java

@@ -28,4 +28,6 @@ public interface MceReceiveService extends CrudService<MceReceive> {
 
     void add(String mceReceive);
 
+    boolean removeById(Integer id);
+
 }

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/MceReceiveServiceImpl.java

@@ -110,7 +110,8 @@ public class MceReceiveServiceImpl extends AbstractCrudService<MceReceiveMapper,
                         startTime,endTime)
                 .eq(StringUtils.isNotBlank(infoType),MceContent::getInfoType, infoType)
                 .eq(MceContent::getCreateBy,SecurityUtils.getUsername())
-                .eq(MceContent::getTenantId,SecurityUtils.getTenantId());
+                .eq(MceContent::getTenantId,SecurityUtils.getTenantId())
+                .orderByDesc(MceContent::getId);
         page = mceContentService.page(page,lambdaQuery1);
         if (CollectionUtils.isNotEmpty(page.getRecords())) {
             List<Integer> contentIds = new ArrayList<>();
@@ -260,8 +261,8 @@ public class MceReceiveServiceImpl extends AbstractCrudService<MceReceiveMapper,
                             mceReceive1.setReadFlag(0);
                             mceReceive1.setInfoType(mceReceiveVO.get("infoType").toString());
                             mceReceive1.setModuleId((int)mceReceiveVO.get("id"));
-                            if (mceReceiveVO.containsKey("userId")) {
-                                mceReceive1.setIssuerId((int)mceReceiveVO.get("userId"));
+                            if (mceReceiveVO.containsKey("userName")) {
+                                mceReceive1.setIssuerName(mceReceiveVO.get("userName").toString());
                             }
                             mceReceive1.setReceiverName(list.get(i).getUserName());
                             mceReceive1.setCreateBy(SecurityUtils.getUsername());
@@ -293,4 +294,12 @@ public class MceReceiveServiceImpl extends AbstractCrudService<MceReceiveMapper,
             }
         }
     }
+
+    @Override
+    public boolean removeById(Integer id) {
+        LambdaQueryWrapper<MceReceive> lambdaQuery = Wrappers.lambdaQuery();
+        lambdaQuery.eq(MceReceive::getContentId,id);
+        this.remove(lambdaQuery);
+        return mceContentService.removeById(id);
+    }
 }

base-modules/service-system/service-system-biz/src/main/resources/mapper/system/MceReceiveMapper.xml

@@ -17,7 +17,7 @@
         <result column="create_time" property="createTime" />
         <result column="update_by" property="updateBy" />
         <result column="update_time" property="updateTime" />
-        <result column="issuer_id" property="issuerId" />
+        <result column="issuer_name" property="issuerName" />
     </resultMap>
 
 </mapper>