|
|
@@ -29,6 +29,8 @@ import com.goafanti.common.utils.DateUtils;
|
|
|
import com.goafanti.common.utils.StringUtils;
|
|
|
import com.goafanti.core.mybatis.page.Pagination;
|
|
|
import com.goafanti.techproject.bo.InputTechProject;
|
|
|
+import com.goafanti.techproject.bo.TechProjectManageListBo;
|
|
|
+import com.goafanti.techproject.bo.TechWebsiteDetailBo;
|
|
|
import com.goafanti.techproject.bo.TechWebsiteListBo;
|
|
|
import com.goafanti.techproject.service.TechProjectLogService;
|
|
|
import com.goafanti.techproject.service.TechProjectService;
|
|
|
@@ -56,6 +58,7 @@ public class AdminTechProjectController extends CertifyApiController {
|
|
|
* @param pageSize
|
|
|
* @return
|
|
|
*/
|
|
|
+ @SuppressWarnings("unchecked")
|
|
|
@RequestMapping(value = "/listTechProject", method = RequestMethod.POST)
|
|
|
public Result listClientTechProject(String province, String unitName, String pageNo, String pageSize) {
|
|
|
Result res = new Result();
|
|
|
@@ -67,7 +70,17 @@ public class AdminTechProjectController extends CertifyApiController {
|
|
|
if (StringUtils.isNumeric(pageNo)) {
|
|
|
pNo = Integer.parseInt(pageNo);
|
|
|
}
|
|
|
- res.setData(techProjectService.listManageTechProject(province, unitName, pNo, pSize));
|
|
|
+ Pagination<TechProjectManageListBo> t = techProjectService.listManageTechProject(province, unitName, pNo, pSize);
|
|
|
+ if (null != t) {
|
|
|
+ List<TechProjectManageListBo> l = (List<TechProjectManageListBo>) t.getList();
|
|
|
+ for (TechProjectManageListBo w : l) {
|
|
|
+ if (!StringUtils.isBlank(w.getPassword())) {
|
|
|
+ w.setPassword(Base64Utils.decodeData(w.getPassword()));
|
|
|
+ }
|
|
|
+ }
|
|
|
+ t.setList(l);
|
|
|
+ res.setData(t);
|
|
|
+ }
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
@@ -93,7 +106,7 @@ public class AdminTechProjectController extends CertifyApiController {
|
|
|
return res;
|
|
|
}
|
|
|
User curUser = userService.selectByPrimaryKey(techProject.getUid());
|
|
|
- if (checkCertify(res, curUser)) {
|
|
|
+ if (!checkCertify(res, curUser)) {
|
|
|
return res;
|
|
|
}
|
|
|
TechProject tp = new TechProject();
|
|
|
@@ -222,7 +235,7 @@ public class AdminTechProjectController extends CertifyApiController {
|
|
|
@RequestMapping(value = "/techWebsiteDetail", method = RequestMethod.POST)
|
|
|
public Result techWebsiteDetail(String id) {
|
|
|
Result res = new Result();
|
|
|
- TechWebsite w = techWebsiteService.selectByPrimaryKey(id);
|
|
|
+ TechWebsiteDetailBo w = techWebsiteService.selectTechWebsiteDetail(id);
|
|
|
if (null != w && !StringUtils.isBlank(w.getPassword())) {
|
|
|
w.setPassword(Base64Utils.decodeData(w.getPassword()));
|
|
|
}
|