修改社会力量bug

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/SocialPowerController.java

@@ -246,7 +246,7 @@ public class SocialPowerController extends AbstractBaseController {
 					}
 
 					if (StringUtil.isNotEmpty(dto.getLocation())) {
-						socialPower.setCompanyName(dto.getLocation());
+						socialPower.setLocation(dto.getLocation());
 					} else {
 						return CommonResponseUtil.failure("请补充所在地信息！");
 					}

amos-boot-system-equip/src/main/resources/mapper/SocialPowerMapper.xml

@@ -26,7 +26,7 @@
             </if>
         </where>
        ORDER BY
-        wsp.create_date DESC
+        CONVERT(wsp.company_name USING gbk) ASC
     </select>
 
     <select id="getSocialPowerList" resultType="Map">