Browse Source

Merge branch 'master' into test

yumeng 5 years ago
parent
commit
bae8d19ebd

+ 17 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProjectController.java

@@ -10,9 +10,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.ctop.entity.Advertiser;
 import org.jeecg.modules.ctop.entity.Advertiser;
 import org.jeecg.modules.ctop.entity.Project;
 import org.jeecg.modules.ctop.entity.Project;
@@ -89,13 +91,15 @@ public class ProjectController {
         String roleCode = materialReportMapper.getRoleCodeByUserId(userId);
         String roleCode = materialReportMapper.getRoleCodeByUserId(userId);
         QueryWrapper<Project> queryWrapper = new QueryWrapper<>();
         QueryWrapper<Project> queryWrapper = new QueryWrapper<>();
         if (!"admin".equals(roleCode)) {
         if (!"admin".equals(roleCode)) {
-            queryWrapper.eq("user_id", userId);
+            queryWrapper.eq("responsible_id", userId);
             queryWrapper.orderByDesc("create_time");
             queryWrapper.orderByDesc("create_time");
         }
         }
         List<Project> projects = projectMapper.selectList(queryWrapper);
         List<Project> projects = projectMapper.selectList(queryWrapper);
         map.put("success", true);
         map.put("success", true);
         map.put("code", 0);
         map.put("code", 0);
         map.put("result", projects);
         map.put("result", projects);
+
+
         return map;
         return map;
     }
     }
 
 
@@ -119,6 +123,18 @@ public class ProjectController {
         Result<IPage<Project>> result = new Result<IPage<Project>>();
         Result<IPage<Project>> result = new Result<IPage<Project>>();
         QueryWrapper<Project> queryWrapper = QueryGenerator.initQueryWrapper(project, req.getParameterMap());
         QueryWrapper<Project> queryWrapper = QueryGenerator.initQueryWrapper(project, req.getParameterMap());
         Page<Project> page = new Page<Project>(pageNo, pageSize);
         Page<Project> page = new Page<Project>(pageNo, pageSize);
+
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        if (Check.isNull(sysUser)) {
+            result.setSuccess(false);
+            return result;
+        }
+
+        String roleCode = materialReportMapper.getRoleCodeByUserId(sysUser.getId());
+        if (!"admin".equals(roleCode)) {
+            queryWrapper.eq("user_id", sysUser.getId());
+            queryWrapper.orderByDesc("create_time");
+        }
         IPage<Project> pageList = projectService.page(page, queryWrapper);
         IPage<Project> pageList = projectService.page(page, queryWrapper);
         result.setSuccess(true);
         result.setSuccess(true);
         result.setResult(pageList);
         result.setResult(pageList);

+ 3 - 6
module-common/src/main/java/cn/com/ctop/common/module/service/impl/MaterialInfoServiceImpl.java

@@ -89,7 +89,8 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
     public Map<String, Object> insert(JSONObject jsonObject) {
     public Map<String, Object> insert(JSONObject jsonObject) {
         Map<String, Object> resultMap = new HashMap<>();
         Map<String, Object> resultMap = new HashMap<>();
         try {
         try {
-            Boolean isVideo = imgLocation(jsonObject.getString("url"));
+            // Boolean isVideo = imgLocation(jsonObject.getString("url"));
+            String type = jsonObject.getString("type");
             MaterialInfo info = new MaterialInfo();
             MaterialInfo info = new MaterialInfo();
             info.setId(jsonObject.getString("code"));
             info.setId(jsonObject.getString("code"));
             info.setCode(jsonObject.getString("code"));
             info.setCode(jsonObject.getString("code"));
@@ -109,11 +110,7 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
             info.setMaterialDescribe(jsonObject.getString("materialDescribe"));
             info.setMaterialDescribe(jsonObject.getString("materialDescribe"));
             info.setCreateTime(new Date());
             info.setCreateTime(new Date());
             info.setUpdateTime(new Date());
             info.setUpdateTime(new Date());
-            if (isVideo) {
-                info.setType("VIDEO");
-            } else {
-                info.setType("IMAGE");
-            }
+            info.setType(type);
             this.save(info);
             this.save(info);
             Map<String, Object> deleteMap = new HashMap<>();
             Map<String, Object> deleteMap = new HashMap<>();
             deleteMap.put("material_id", info.getId());
             deleteMap.put("material_id", info.getId());