Browse Source

业务项目管理BUG修改

anderx 8 years ago
parent
commit
65b0af9376

+ 0 - 3
src/main/java/com/goafanti/admin/controller/AdminVarietiesApiController.java

@@ -5,7 +5,6 @@ import javax.annotation.Resource;
 
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 
@@ -13,8 +12,6 @@ import com.goafanti.admin.service.AdminVarietiesService;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.BaseController;
-import com.goafanti.common.model.Admin;
-import com.goafanti.common.model.BusinessVarieties;
 import com.goafanti.common.utils.StringUtils;
 @RestController
 @RequestMapping("api/admin/Varieties")

+ 0 - 1
src/main/java/com/goafanti/admin/service/impl/AdminVarietiesServiceImpl.java

@@ -12,7 +12,6 @@ import org.springframework.stereotype.Service;
 
 import com.goafanti.admin.bo.BusinessVarietiesBo;
 import com.goafanti.admin.service.AdminVarietiesService;
-import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.dao.BusinessVarietiesMapper;
 import com.goafanti.common.model.BusinessVarieties;
 import com.goafanti.common.utils.StringUtils;

+ 5 - 2
src/main/java/com/goafanti/admin/service/impl/BusinessProjectServiceImpl.java

@@ -25,6 +25,7 @@ import com.goafanti.common.model.ProjectSize;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.core.shiro.token.TokenManager;
 
 @Service
 public class BusinessProjectServiceImpl extends BaseMybatisDao<BusinessProjectMapper> implements BusinessProjectService {
@@ -48,8 +49,10 @@ public class BusinessProjectServiceImpl extends BaseMybatisDao<BusinessProjectMa
 			bp.setDistrict(district);
 		}
 		bp.setDeleteSign(0);
-		//bp.setCreateId(TokenManager.getAdminId());
-		bp.setCreateId("f31c0d1a-05bc-4f5c-b4a8-95f983d24131");
+		if (StringUtils.isNotBlank(TokenManager.getAdminId())) {
+			bp.setCreateId(TokenManager.getAdminId());
+		}
+		//bp.setCreateId("f31c0d1a-05bc-4f5c-b4a8-95f983d24131");
 		bp.setCreateTime(new Date());
 		bp.setStatus("0");
 

+ 1 - 1
src/main/java/com/goafanti/common/mapper/BusinessVarietiesMapper.xml

@@ -422,7 +422,7 @@
   		select b.id,b.create_id as createId ,b.create_time as createTime,b.update_time as updateTime,
   		b.delete_sign daleteSign,b.cid,b.cname,b.super_id superId ,b.layer,b.status
   		from business_varieties b
-  		where b.delete_sign=0
+  		where b.delete_sign=0 and status=0
   </select>
   <select id="editVarieties" parameterType="string" resultType="com.goafanti.admin.bo.BusinessVarietiesBo">
   		select b.id,b.create_id as createId ,b.create_time as createTime,b.update_time as updateTime,

+ 2 - 0
src/main/java/com/goafanti/common/mapper/OrganizationManagementMapper.xml

@@ -406,6 +406,8 @@
 		from department_management om 
 		where
 		om.deleted_sign = '0'
+		and
+		om.name != '平台超管中心'
 		<if test="name !=null">
 			AND om.name=#{name,jdbcType=VARCHAR}
 		</if>